Update internal iOS dimensions

Bug: b/299058719
Change-Id: If356ba92bd49c5e650b3147ee94f28947318c4e5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/318961
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Christoffer Jansson <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40699}
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index c9fd0ee..68632f1 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -12,13 +12,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "AppRTCMobile_test_apk",
@@ -33,13 +31,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "android_instrumentation_test_apk",
@@ -54,13 +50,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "audio_decoder_unittests",
@@ -75,13 +69,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_audio_unittests",
@@ -96,13 +88,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_video_unittests",
@@ -117,13 +107,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "dcsctp_unittests",
@@ -138,13 +126,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 2
         },
@@ -160,13 +146,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -182,13 +166,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -204,13 +186,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_media_unittests",
@@ -225,13 +205,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_pc_unittests",
@@ -246,13 +224,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_stats_unittests",
@@ -267,13 +243,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -289,13 +263,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "slow_peer_connection_unittests",
@@ -310,13 +282,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -332,13 +302,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "system_wrappers_unittests",
@@ -353,13 +321,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "test_support_unittests",
@@ -374,13 +340,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "tools_unittests",
@@ -395,13 +359,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -417,13 +379,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "voip_unittests",
@@ -438,13 +398,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_nonparallel_tests",
@@ -486,13 +444,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "AppRTCMobile_test_apk",
@@ -507,13 +463,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "android_instrumentation_test_apk",
@@ -528,13 +482,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "audio_decoder_unittests",
@@ -549,13 +501,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_audio_unittests",
@@ -570,13 +520,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_video_unittests",
@@ -591,13 +539,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "dcsctp_unittests",
@@ -612,13 +558,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 2
         },
@@ -634,13 +578,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -656,13 +598,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -678,13 +618,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_media_unittests",
@@ -699,13 +637,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_pc_unittests",
@@ -720,13 +656,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_stats_unittests",
@@ -741,13 +675,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -763,13 +695,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "slow_peer_connection_unittests",
@@ -784,13 +714,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -806,13 +734,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "system_wrappers_unittests",
@@ -827,13 +753,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "test_support_unittests",
@@ -848,13 +772,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "tools_unittests",
@@ -869,13 +791,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -891,13 +811,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "voip_unittests",
@@ -912,13 +830,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_nonparallel_tests",
@@ -960,13 +876,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -989,13 +903,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "AppRTCMobile_test_apk",
@@ -1010,13 +922,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "android_instrumentation_test_apk",
@@ -1031,13 +941,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "audio_decoder_unittests",
@@ -1052,13 +960,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_audio_unittests",
@@ -1073,13 +979,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_video_unittests",
@@ -1094,13 +998,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "dcsctp_unittests",
@@ -1115,13 +1017,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 2
         },
@@ -1137,13 +1037,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -1159,13 +1057,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1181,13 +1077,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_media_unittests",
@@ -1202,13 +1096,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_pc_unittests",
@@ -1223,13 +1115,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_stats_unittests",
@@ -1244,13 +1134,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -1266,13 +1154,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "slow_peer_connection_unittests",
@@ -1287,13 +1173,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1309,13 +1193,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "system_wrappers_unittests",
@@ -1330,13 +1212,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "test_support_unittests",
@@ -1351,13 +1231,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "tools_unittests",
@@ -1372,13 +1250,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1394,13 +1270,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "voip_unittests",
@@ -1415,13 +1289,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_nonparallel_tests",
@@ -1463,13 +1335,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "AppRTCMobile_test_apk",
@@ -1484,13 +1354,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "android_instrumentation_test_apk",
@@ -1505,13 +1373,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "audio_decoder_unittests",
@@ -1526,13 +1392,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_audio_unittests",
@@ -1547,13 +1411,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_video_unittests",
@@ -1568,13 +1430,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "dcsctp_unittests",
@@ -1589,13 +1449,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 2
         },
@@ -1611,13 +1469,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -1633,13 +1489,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1655,13 +1509,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_media_unittests",
@@ -1676,13 +1528,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_pc_unittests",
@@ -1697,13 +1547,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_stats_unittests",
@@ -1718,13 +1566,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -1740,13 +1586,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "slow_peer_connection_unittests",
@@ -1761,13 +1605,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1783,13 +1625,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "system_wrappers_unittests",
@@ -1804,13 +1644,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "test_support_unittests",
@@ -1825,13 +1663,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "tools_unittests",
@@ -1846,13 +1682,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1868,13 +1702,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "voip_unittests",
@@ -1889,13 +1721,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_nonparallel_tests",
@@ -1948,12 +1778,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -1974,12 +1802,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -2000,12 +1826,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -2026,12 +1850,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -2052,12 +1874,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -2078,12 +1898,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -2104,12 +1922,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -2131,12 +1947,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -2157,12 +1971,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -2184,12 +1996,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -2210,12 +2020,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -2233,12 +2041,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -2257,12 +2063,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -2276,12 +2080,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -2295,12 +2097,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -2314,12 +2114,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -2333,12 +2131,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -2353,12 +2149,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -2373,12 +2167,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -2393,12 +2185,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -2412,12 +2202,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -2431,12 +2219,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -2450,12 +2236,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -2470,12 +2254,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -2489,12 +2271,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -2508,12 +2288,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -2528,12 +2306,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -2547,12 +2323,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -2566,12 +2340,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -2585,12 +2357,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -2605,12 +2375,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -2624,12 +2392,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -2647,12 +2413,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -2666,12 +2430,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -2685,12 +2447,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -2704,12 +2464,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -2723,12 +2481,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -2743,12 +2499,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -2763,12 +2517,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -2783,12 +2535,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -2802,12 +2552,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -2821,12 +2569,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -2840,12 +2586,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -2860,12 +2604,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -2879,12 +2621,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -2899,12 +2639,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -2918,12 +2656,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -2937,12 +2673,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -2956,12 +2690,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -2976,12 +2708,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -2995,12 +2725,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -3018,12 +2746,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -3037,12 +2763,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -3056,12 +2780,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -3075,12 +2797,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -3094,12 +2814,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -3114,12 +2832,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -3134,12 +2850,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -3154,12 +2868,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -3173,12 +2885,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -3192,12 +2902,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -3211,12 +2919,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -3231,12 +2937,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -3250,12 +2954,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -3270,12 +2972,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -3289,12 +2989,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -3308,12 +3006,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -3327,12 +3023,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -3347,12 +3041,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -3366,12 +3058,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -3389,12 +3079,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -3408,12 +3096,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -3427,12 +3113,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -3446,12 +3130,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -3465,12 +3147,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -3485,12 +3165,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -3505,12 +3183,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -3525,12 +3201,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -3544,12 +3218,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -3563,12 +3235,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -3582,12 +3252,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -3602,12 +3270,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -3621,12 +3287,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -3640,12 +3304,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -3660,12 +3322,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -3679,12 +3339,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -3698,12 +3356,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -3717,12 +3373,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -3737,12 +3391,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -3756,12 +3408,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -3779,12 +3429,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -3798,12 +3446,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -3817,12 +3463,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -3836,12 +3480,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -3855,12 +3497,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -3875,12 +3515,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -3895,12 +3533,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -3915,12 +3551,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -3934,12 +3568,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -3953,12 +3585,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -3972,12 +3602,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -3992,12 +3620,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -4011,12 +3637,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -4030,12 +3654,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -4050,12 +3672,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -4069,12 +3689,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -4088,12 +3706,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -4107,12 +3723,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -4127,12 +3741,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -4146,12 +3758,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -4169,12 +3779,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -4188,12 +3796,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -4207,12 +3813,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -4226,12 +3830,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -4245,12 +3847,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -4265,12 +3865,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -4285,12 +3883,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -4305,12 +3901,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -4324,12 +3918,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -4343,12 +3935,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -4362,12 +3952,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -4382,12 +3970,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -4401,12 +3987,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -4421,12 +4005,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -4440,12 +4022,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -4459,12 +4039,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -4478,12 +4056,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -4498,12 +4074,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -4517,12 +4091,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -4541,12 +4113,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -4560,12 +4130,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -4579,12 +4147,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -4598,12 +4164,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -4617,12 +4181,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -4637,12 +4199,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -4657,12 +4217,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -4677,12 +4235,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -4696,12 +4252,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -4715,12 +4269,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -4734,12 +4286,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -4754,12 +4304,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -4773,12 +4321,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -4793,12 +4339,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -4812,12 +4356,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -4831,12 +4373,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -4850,12 +4390,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -4870,12 +4408,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -4889,12 +4425,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -4914,12 +4448,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -4933,12 +4465,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -4952,12 +4482,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -4971,12 +4499,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -4990,12 +4516,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -5010,12 +4534,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -5030,12 +4552,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -5050,12 +4570,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -5069,12 +4587,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -5088,12 +4604,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -5107,12 +4621,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -5127,12 +4639,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -5146,12 +4656,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -5165,12 +4673,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -5185,12 +4691,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -5204,12 +4708,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -5223,12 +4725,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -5242,12 +4742,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -5262,12 +4760,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -5281,12 +4777,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -5305,12 +4799,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -5324,12 +4816,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -5343,12 +4833,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -5362,12 +4850,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -5381,12 +4867,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -5401,12 +4885,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -5421,12 +4903,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -5441,12 +4921,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -5460,12 +4938,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -5479,12 +4955,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -5498,12 +4972,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -5518,12 +4990,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -5537,12 +5007,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -5556,12 +5024,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -5576,12 +5042,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -5595,12 +5059,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -5614,12 +5076,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -5633,13 +5093,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04",
+            "pool": "WebRTC-baremetal"
+          }
         },
         "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
       },
@@ -5653,12 +5111,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -5673,12 +5129,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -5692,12 +5146,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -5717,13 +5169,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -5737,13 +5187,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -5757,13 +5205,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -5777,13 +5223,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -5797,13 +5241,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -5818,13 +5260,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -5839,13 +5279,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -5860,13 +5298,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -5880,13 +5316,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -5900,13 +5334,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -5920,13 +5352,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -5941,13 +5371,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -5961,13 +5389,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -5982,13 +5408,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -6002,13 +5426,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -6022,13 +5444,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -6042,13 +5462,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -6063,13 +5481,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -6083,13 +5499,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -6108,13 +5522,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -6128,13 +5540,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -6148,13 +5558,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -6168,13 +5576,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -6188,13 +5594,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -6209,13 +5613,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -6230,13 +5632,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -6251,13 +5651,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -6271,13 +5669,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -6291,13 +5687,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -6311,13 +5705,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -6332,13 +5724,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -6352,13 +5742,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -6373,13 +5761,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -6393,13 +5779,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -6413,13 +5797,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -6433,13 +5815,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -6454,13 +5834,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -6474,13 +5852,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -6498,12 +5874,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -6517,12 +5891,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -6536,12 +5908,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -6555,12 +5925,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -6574,12 +5942,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -6594,12 +5960,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -6614,12 +5978,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -6634,12 +5996,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -6653,12 +6013,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -6672,12 +6030,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -6691,12 +6047,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -6711,12 +6065,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -6730,12 +6082,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -6750,12 +6100,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -6769,12 +6117,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -6788,12 +6134,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -6807,13 +6151,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12",
+            "pool": "WebRTC-baremetal"
+          }
         },
         "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
       },
@@ -6827,12 +6169,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -6847,12 +6187,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -6866,12 +6204,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -6889,12 +6225,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -6908,12 +6242,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -6927,12 +6259,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -6946,12 +6276,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -6965,12 +6293,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -6985,12 +6311,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -7005,12 +6329,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -7025,12 +6347,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -7044,12 +6364,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -7063,12 +6381,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -7082,12 +6398,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -7102,12 +6416,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -7121,12 +6433,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -7141,12 +6451,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -7160,12 +6468,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -7179,12 +6485,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -7198,12 +6502,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -7218,12 +6520,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -7237,12 +6537,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -7261,12 +6559,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -7287,12 +6583,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -7306,12 +6600,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -7325,12 +6617,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -7344,12 +6634,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -7363,12 +6651,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -7383,12 +6669,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -7403,12 +6687,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -7423,12 +6705,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -7442,12 +6722,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -7461,12 +6739,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -7480,12 +6756,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -7500,12 +6774,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -7519,12 +6791,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -7539,12 +6809,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -7558,12 +6826,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -7577,12 +6843,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -7596,12 +6860,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -7616,12 +6878,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -7635,12 +6895,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -7658,12 +6916,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -7677,12 +6933,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -7696,12 +6950,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -7715,12 +6967,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -7734,12 +6984,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -7754,12 +7002,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -7774,12 +7020,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -7794,12 +7038,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -7813,12 +7055,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -7832,12 +7072,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -7851,12 +7089,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -7871,12 +7107,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -7890,12 +7124,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -7910,12 +7142,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -7929,12 +7159,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -7948,12 +7176,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -7967,12 +7193,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -7987,12 +7211,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -8006,12 +7228,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -8029,12 +7249,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -8048,12 +7266,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -8067,12 +7283,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -8086,12 +7300,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -8105,12 +7317,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -8125,12 +7335,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -8145,12 +7353,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -8165,12 +7371,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -8184,12 +7388,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -8203,12 +7405,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -8222,12 +7422,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -8242,12 +7440,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -8261,12 +7457,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -8281,12 +7475,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -8300,12 +7492,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -8319,12 +7509,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -8338,12 +7526,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -8358,12 +7544,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -8377,12 +7561,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -8400,12 +7582,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -8419,12 +7599,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -8438,12 +7616,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -8457,12 +7633,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -8476,12 +7650,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -8496,12 +7668,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -8516,12 +7686,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -8536,12 +7704,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -8555,12 +7721,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -8574,12 +7738,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -8593,12 +7755,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -8613,12 +7773,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -8632,12 +7790,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -8652,12 +7808,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -8671,12 +7825,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -8690,12 +7842,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -8709,13 +7859,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045",
+            "pool": "WebRTC-baremetal"
+          }
         },
         "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
       },
@@ -8729,12 +7877,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -8749,12 +7895,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -8768,12 +7912,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -8811,12 +7953,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -8862,12 +8002,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -8913,12 +8051,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -8963,12 +8099,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -9013,12 +8147,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9063,12 +8195,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9113,12 +8243,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -9163,12 +8291,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9213,12 +8339,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9263,12 +8387,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -9313,12 +8435,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9363,12 +8483,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9413,12 +8531,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -9463,12 +8579,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9513,12 +8627,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9563,12 +8675,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -9614,12 +8724,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9665,12 +8773,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9716,13 +8822,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -9768,13 +8872,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9820,13 +8922,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9872,12 +8972,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -9922,12 +9020,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -9972,12 +9068,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10022,12 +9116,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -10072,12 +9164,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10122,12 +9212,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10172,12 +9260,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -10222,12 +9308,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10272,12 +9356,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10322,12 +9404,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -10373,12 +9453,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10424,12 +9502,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10476,12 +9552,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -10527,12 +9601,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10578,12 +9650,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10629,12 +9699,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -10680,12 +9748,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10731,12 +9797,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10781,13 +9845,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -10833,13 +9895,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10885,13 +9945,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -10937,12 +9995,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -10987,12 +10043,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11037,12 +10091,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11087,12 +10139,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -11137,12 +10187,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11187,12 +10235,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11237,12 +10283,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -11287,12 +10331,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11337,12 +10379,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11387,12 +10427,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -11437,12 +10475,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11487,12 +10523,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11537,12 +10571,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -11588,12 +10620,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11639,12 +10669,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11690,12 +10718,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -11740,12 +10766,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11790,12 +10814,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11840,12 +10862,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -11890,12 +10910,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -11940,12 +10958,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json
index 74393b5..80a1bc2 100644
--- a/infra/specs/client.webrtc.perf.json
+++ b/infra/specs/client.webrtc.perf.json
@@ -19,15 +19,13 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "redfin",
-              "gce": "0",
-              "os": "Android",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "redfin",
+            "gce": "0",
+            "os": "Android",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -54,15 +52,13 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "redfin",
-              "gce": "0",
-              "os": "Android",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "redfin",
+            "gce": "0",
+            "os": "Android",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -92,15 +88,13 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "redfin",
-              "gce": "0",
-              "os": "Android",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "redfin",
+            "gce": "0",
+            "os": "Android",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -127,15 +121,13 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "redfin",
-              "gce": "0",
-              "os": "Android",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "redfin",
+            "gce": "0",
+            "os": "Android",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -171,14 +163,12 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "gce": "1",
-              "os": "Ubuntu-18.04",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "gce": "1",
+            "os": "Ubuntu-18.04",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -209,14 +199,12 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "gce": "1",
-              "os": "Ubuntu-18.04",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "gce": "1",
+            "os": "Ubuntu-18.04",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -246,13 +234,11 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "gce": "0",
-              "os": "Ubuntu-18.04",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "gce": "0",
+            "os": "Ubuntu-18.04",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -281,13 +267,11 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "gce": "0",
-              "os": "Ubuntu-18.04",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "gce": "0",
+            "os": "Ubuntu-18.04",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -317,14 +301,12 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "gce": "0",
-              "os": "Mac-11",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "gce": "0",
+            "os": "Mac-11",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -353,14 +335,12 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "gce": "0",
-              "os": "Mac-11",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "gce": "0",
+            "os": "Mac-11",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -390,14 +370,12 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "gce": "0",
-              "os": "Mac-12",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "gce": "0",
+            "os": "Mac-12",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -426,14 +404,12 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "gce": "0",
-              "os": "Mac-12",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "gce": "0",
+            "os": "Mac-12",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -463,13 +439,11 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "gce": "0",
-              "os": "Windows-10",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "gce": "0",
+            "os": "Windows-10",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
@@ -498,13 +472,11 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "gce": "0",
-              "os": "Windows-10",
-              "pool": "WebRTC-perf"
-            }
-          ],
+          "dimensions": {
+            "gce": "0",
+            "os": "Windows-10",
+            "pool": "WebRTC-perf"
+          },
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
diff --git a/infra/specs/internal.client.webrtc.json b/infra/specs/internal.client.webrtc.json
index ba1d109..d79d909 100644
--- a/infra/specs/internal.client.webrtc.json
+++ b/infra/specs/internal.client.webrtc.json
@@ -28,12 +28,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -69,12 +67,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -111,12 +107,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "hard_timeout": 7200,
           "io_timeout": 7200,
           "named_caches": [
@@ -155,12 +149,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -197,12 +189,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -238,12 +228,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -279,12 +267,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -320,12 +306,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -361,12 +345,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -402,12 +384,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -443,12 +423,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -495,13 +473,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "id": "mac-254-e504",
-              "os": "iOS-12.4.1",
-              "pool": "WebRTC"
-            }
-          ],
+          "dimensions": {
+            "id": "mac-254-e504",
+            "os": "iOS-12.4.1",
+            "pool": "WebRTC"
+          },
           "hard_timeout": 10800,
           "idempotent": false,
           "io_timeout": 10800,
@@ -544,12 +520,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -585,12 +559,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -627,12 +599,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "hard_timeout": 7200,
           "io_timeout": 7200,
           "named_caches": [
@@ -671,12 +641,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -713,12 +681,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -754,12 +720,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -795,12 +759,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -836,12 +798,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -877,12 +837,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -918,12 +876,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -959,12 +915,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "os": "iOS-15.7",
-              "pool": "chrome.tests"
-            }
-          ],
+          "dimensions": {
+            "os": "iOS-16.6",
+            "pool": "chrome.tests"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 06a763b..899ab83 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -64,10 +64,10 @@
       'has_native_resultdb_integration': True
     }
   },
-  'ios-device-15.7': {
+  'ios-device-16.6': {
     'swarming': {
       'dimensions': {
-        'os': 'iOS-15.7',
+        'os': 'iOS-16.6',
         'pool': 'chrome.tests'
       }
     }
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index 691aa13..c6d8e5d 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -44,13 +44,13 @@
       '--test-arg=--undefok=test_launcher_summary_output'
     ],
   },
-  'ios-device-15.7': {
+  'ios-device-16.6': {
     'swarming': {
       'dimensions': {
-        'os': 'iOS-15.7',
-        'pool': 'chrome.tests',
-      },
-    },
+        'os': 'iOS-16.6',
+        'pool': 'chrome.tests'
+      }
+    }
   },
   'ios-device-perf': {
     'swarming': {
@@ -70,6 +70,14 @@
       }]
     }
   },
+  'ios_runtime_cache_16_2': {
+    'swarming': {
+      'named_caches': [{
+        'name': 'runtime_ios_16_2',
+        'path': 'Runtime-ios-16.2'
+      }]
+    }
+  },
   'limited-capacity': {
     # Sometimes there are multiple tests that can be run only on one machine.
     # We need to increase timeouts so the tests dont expire before the machine is freed.
@@ -207,4 +215,13 @@
       }]
     }
   },
+  'xcode_14_main': {
+    'args': ['--xcode-build-version', '14c18'],
+    'swarming': {
+      'named_caches': [{
+        'name': 'xcode_ios_14c18',
+        'path': 'Xcode.app'
+      }]
+    }
+  },
 }
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index dff7c3d..b89ee5f 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -12,13 +12,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "AppRTCMobile_test_apk",
@@ -33,13 +31,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "android_instrumentation_test_apk",
@@ -54,13 +50,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "audio_decoder_unittests",
@@ -75,13 +69,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_audio_unittests",
@@ -96,13 +88,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_video_unittests",
@@ -117,13 +107,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "dcsctp_unittests",
@@ -138,13 +126,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 2
         },
@@ -160,13 +146,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -182,13 +166,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -204,13 +186,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_media_unittests",
@@ -225,13 +205,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_pc_unittests",
@@ -246,13 +224,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_stats_unittests",
@@ -267,13 +243,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -289,13 +263,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "slow_peer_connection_unittests",
@@ -310,13 +282,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -332,13 +302,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "system_wrappers_unittests",
@@ -353,13 +321,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "test_support_unittests",
@@ -374,13 +340,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "tools_unittests",
@@ -395,13 +359,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -417,13 +379,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "voip_unittests",
@@ -438,13 +398,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_nonparallel_tests",
@@ -463,13 +421,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_perf_tests",
@@ -511,13 +467,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "AppRTCMobile_test_apk",
@@ -532,13 +486,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "android_instrumentation_test_apk",
@@ -553,13 +505,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "audio_decoder_unittests",
@@ -574,13 +524,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_audio_unittests",
@@ -595,13 +543,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_video_unittests",
@@ -616,13 +562,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "dcsctp_unittests",
@@ -637,13 +581,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 2
         },
@@ -659,13 +601,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -681,13 +621,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -703,13 +641,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_media_unittests",
@@ -724,13 +660,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_pc_unittests",
@@ -745,13 +679,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_stats_unittests",
@@ -766,13 +698,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -788,13 +718,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "slow_peer_connection_unittests",
@@ -809,13 +737,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -831,13 +757,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "system_wrappers_unittests",
@@ -852,13 +776,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "test_support_unittests",
@@ -873,13 +795,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "tools_unittests",
@@ -894,13 +814,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -916,13 +834,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "voip_unittests",
@@ -937,13 +853,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_nonparallel_tests",
@@ -962,13 +876,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_perf_tests",
@@ -1010,13 +922,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "AppRTCMobile_test_apk",
@@ -1031,13 +941,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "android_instrumentation_test_apk",
@@ -1052,13 +960,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "audio_decoder_unittests",
@@ -1073,13 +979,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_audio_unittests",
@@ -1094,13 +998,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_video_unittests",
@@ -1115,13 +1017,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "dcsctp_unittests",
@@ -1136,13 +1036,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 2
         },
@@ -1158,13 +1056,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -1180,13 +1076,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1202,13 +1096,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_media_unittests",
@@ -1223,13 +1115,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_pc_unittests",
@@ -1244,13 +1134,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_stats_unittests",
@@ -1265,13 +1153,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -1287,13 +1173,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "slow_peer_connection_unittests",
@@ -1308,13 +1192,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1330,13 +1212,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "system_wrappers_unittests",
@@ -1351,13 +1231,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "test_support_unittests",
@@ -1372,13 +1250,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "tools_unittests",
@@ -1393,13 +1269,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1415,13 +1289,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "voip_unittests",
@@ -1436,13 +1308,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_nonparallel_tests",
@@ -1461,13 +1331,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_perf_tests",
@@ -1509,13 +1377,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1535,13 +1401,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "AppRTCMobile_test_apk",
@@ -1556,13 +1420,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "android_instrumentation_test_apk",
@@ -1577,13 +1439,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "audio_decoder_unittests",
@@ -1598,13 +1458,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_audio_unittests",
@@ -1619,13 +1477,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "common_video_unittests",
@@ -1640,13 +1496,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "dcsctp_unittests",
@@ -1661,13 +1515,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 2
         },
@@ -1683,13 +1535,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -1705,13 +1555,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1727,13 +1575,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_media_unittests",
@@ -1748,13 +1594,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_pc_unittests",
@@ -1769,13 +1613,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "rtc_stats_unittests",
@@ -1790,13 +1632,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
@@ -1812,13 +1652,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "slow_peer_connection_unittests",
@@ -1833,13 +1671,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1855,13 +1691,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "system_wrappers_unittests",
@@ -1876,13 +1710,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "test_support_unittests",
@@ -1897,13 +1729,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "tools_unittests",
@@ -1918,13 +1748,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 4
         },
@@ -1940,13 +1768,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "voip_unittests",
@@ -1961,13 +1787,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_nonparallel_tests",
@@ -1986,13 +1810,11 @@
           "has_native_resultdb_integration": true
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
+          "dimensions": {
+            "android_devices": "1",
+            "device_type": "walleye",
+            "os": "Android"
+          },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "webrtc_perf_tests",
@@ -2050,12 +1872,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -2076,12 +1896,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -2102,12 +1920,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -2128,12 +1944,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -2154,12 +1968,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -2180,12 +1992,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -2206,12 +2016,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -2233,12 +2041,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -2259,12 +2065,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -2286,12 +2090,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -2312,12 +2114,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -2357,12 +2157,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -2408,12 +2206,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -2459,12 +2255,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -2509,12 +2303,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -2559,12 +2351,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -2609,12 +2399,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -2659,12 +2447,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -2709,12 +2495,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -2759,12 +2543,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -2809,12 +2591,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -2859,12 +2639,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -2909,12 +2687,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -2959,12 +2735,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -3009,12 +2783,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3059,12 +2831,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3109,12 +2879,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -3160,12 +2928,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3211,12 +2977,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3262,13 +3026,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -3314,13 +3076,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3366,13 +3126,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3418,12 +3176,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -3468,12 +3224,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3518,12 +3272,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3568,12 +3320,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -3618,12 +3368,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3668,12 +3416,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3718,12 +3464,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -3768,12 +3512,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3818,12 +3560,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3868,12 +3608,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -3919,12 +3657,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -3970,12 +3706,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4022,12 +3756,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -4073,12 +3805,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4124,12 +3854,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4175,12 +3903,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -4226,12 +3952,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4277,12 +4001,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4327,13 +4049,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -4379,13 +4099,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4431,13 +4149,11 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4483,12 +4199,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -4533,12 +4247,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4583,12 +4295,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4633,12 +4343,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -4683,12 +4391,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4733,12 +4439,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4783,12 +4487,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -4833,12 +4535,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4883,12 +4583,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -4933,12 +4631,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -4983,12 +4679,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -5033,12 +4727,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -5083,12 +4775,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -5134,12 +4824,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -5185,12 +4873,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -5236,12 +4922,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -5286,12 +4970,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -5336,12 +5018,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -5386,12 +5066,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -5436,12 +5114,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -5486,12 +5162,10 @@
               "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
             }
           ],
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "named_caches": [
             {
               "name": "xcode_ios_14c18",
@@ -5521,12 +5195,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -5540,12 +5212,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -5559,12 +5229,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -5578,12 +5246,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -5597,12 +5263,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -5617,12 +5281,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -5637,12 +5299,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -5657,12 +5317,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -5676,12 +5334,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -5695,12 +5351,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -5714,12 +5368,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -5734,12 +5386,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -5753,12 +5403,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -5772,12 +5420,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -5792,12 +5438,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -5811,12 +5455,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -5830,12 +5472,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -5849,12 +5489,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -5869,12 +5507,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -5888,12 +5524,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -5918,12 +5552,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -5938,12 +5570,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -5958,12 +5588,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -5978,12 +5606,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -5998,12 +5624,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -6019,12 +5643,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -6040,12 +5662,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -6061,12 +5681,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -6081,12 +5699,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -6101,12 +5717,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -6121,12 +5735,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -6142,12 +5754,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -6162,12 +5772,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -6182,12 +5790,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -6203,12 +5809,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -6223,12 +5827,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -6243,12 +5845,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -6263,13 +5863,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04",
-              "pool": "WebRTC-baremetal-try"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04",
+            "pool": "WebRTC-baremetal-try"
+          }
         },
         "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
       },
@@ -6290,12 +5888,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/video_coding:video_codec_perf_tests/"
       },
@@ -6310,12 +5906,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -6331,12 +5925,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -6351,12 +5943,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       },
@@ -6377,12 +5967,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_perf_tests/"
       }
@@ -6400,12 +5988,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -6419,12 +6005,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -6438,12 +6022,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -6457,12 +6039,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -6476,12 +6056,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -6496,12 +6074,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -6516,12 +6092,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -6536,12 +6110,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -6555,12 +6127,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -6574,12 +6144,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -6593,12 +6161,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -6613,12 +6179,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -6632,12 +6196,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -6651,12 +6213,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -6671,12 +6231,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -6690,12 +6248,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -6709,12 +6265,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -6728,12 +6282,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -6748,12 +6300,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -6767,12 +6317,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -6791,12 +6339,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -6810,12 +6356,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -6829,12 +6373,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -6848,12 +6390,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -6867,12 +6407,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -6887,12 +6425,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -6907,12 +6443,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -6927,12 +6461,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -6946,12 +6478,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -6965,12 +6495,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -6984,12 +6512,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -7004,12 +6530,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -7023,12 +6547,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -7042,12 +6564,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -7062,12 +6582,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -7081,12 +6599,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -7100,12 +6616,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -7119,12 +6633,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -7139,12 +6651,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -7158,12 +6668,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -7181,12 +6689,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -7205,12 +6711,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -7224,12 +6728,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -7243,12 +6745,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -7262,12 +6762,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -7281,12 +6779,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -7301,12 +6797,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -7321,12 +6815,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -7341,12 +6833,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -7360,12 +6850,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -7379,12 +6867,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -7398,12 +6884,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -7418,12 +6902,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -7437,12 +6919,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -7457,12 +6937,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -7476,12 +6954,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -7495,12 +6971,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -7514,12 +6988,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -7534,12 +7006,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -7553,12 +7023,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-20.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -7576,12 +7044,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -7595,12 +7061,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -7614,12 +7078,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -7633,12 +7095,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -7652,12 +7112,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -7672,12 +7130,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -7692,12 +7148,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -7712,12 +7166,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -7731,12 +7183,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -7750,12 +7200,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -7769,12 +7217,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -7789,12 +7235,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -7808,12 +7252,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -7827,12 +7269,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -7847,12 +7287,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -7866,12 +7304,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -7885,12 +7321,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -7904,13 +7338,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04",
-              "pool": "WebRTC-baremetal-try"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04",
+            "pool": "WebRTC-baremetal-try"
+          }
         },
         "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
       },
@@ -7930,12 +7362,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/video_coding:video_codec_perf_tests/"
       },
@@ -7949,12 +7379,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -7969,12 +7397,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -7988,12 +7414,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       },
@@ -8013,12 +7437,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_perf_tests/"
       }
@@ -8036,12 +7458,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -8055,12 +7475,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -8074,12 +7492,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -8093,12 +7509,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -8112,12 +7526,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -8132,12 +7544,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -8152,12 +7562,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -8172,12 +7580,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -8191,12 +7597,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -8210,12 +7614,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -8229,12 +7631,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -8249,12 +7649,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -8268,12 +7666,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -8288,12 +7684,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -8307,12 +7701,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -8326,12 +7718,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -8345,12 +7735,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -8365,12 +7753,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -8384,12 +7770,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -8407,12 +7791,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -8426,12 +7808,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -8445,12 +7825,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -8464,12 +7842,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -8483,12 +7859,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -8503,12 +7877,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -8523,12 +7895,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -8543,12 +7913,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -8562,12 +7930,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -8581,12 +7947,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -8600,12 +7964,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -8620,12 +7982,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -8639,12 +7999,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -8658,12 +8016,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -8678,12 +8034,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -8697,12 +8051,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -8716,12 +8068,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -8735,12 +8085,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -8755,12 +8103,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -8774,12 +8120,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -8797,12 +8141,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -8816,12 +8158,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -8835,12 +8175,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -8854,12 +8192,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -8873,12 +8209,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -8893,12 +8227,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -8913,12 +8245,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -8933,12 +8263,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -8952,12 +8280,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -8971,12 +8297,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -8990,12 +8314,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -9010,12 +8332,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/desktop_capture:shared_screencast_stream_test/"
       },
@@ -9029,12 +8349,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -9048,12 +8366,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -9068,12 +8384,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -9087,12 +8401,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -9106,12 +8418,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -9125,12 +8435,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -9145,12 +8453,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -9164,12 +8470,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -9187,12 +8491,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -9206,12 +8508,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -9225,12 +8525,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -9244,12 +8542,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -9263,12 +8559,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -9283,12 +8577,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -9303,12 +8595,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -9323,12 +8613,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -9342,12 +8630,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -9361,12 +8647,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -9380,12 +8664,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -9400,12 +8682,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -9419,12 +8699,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -9439,12 +8717,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -9458,12 +8734,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -9477,12 +8751,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -9496,12 +8768,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -9516,12 +8786,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -9535,12 +8803,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -9558,12 +8824,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -9577,12 +8841,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -9596,12 +8858,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -9615,12 +8875,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -9634,12 +8892,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -9654,12 +8910,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -9674,12 +8928,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -9694,12 +8946,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -9713,12 +8963,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -9732,12 +8980,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -9751,12 +8997,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -9771,12 +9015,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -9790,12 +9032,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -9810,12 +9050,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -9829,12 +9067,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -9848,12 +9084,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -9867,12 +9101,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -9887,12 +9119,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -9906,12 +9136,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Ubuntu-18.04"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -9929,13 +9157,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -9949,13 +9175,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -9969,13 +9193,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -9989,13 +9211,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -10009,13 +9229,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -10030,13 +9248,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -10051,13 +9267,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -10072,13 +9286,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -10092,13 +9304,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -10112,13 +9322,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -10132,13 +9340,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -10153,13 +9359,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -10173,13 +9377,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -10194,13 +9396,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -10214,13 +9414,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -10234,13 +9432,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -10254,13 +9450,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -10275,13 +9469,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -10295,13 +9487,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -10321,13 +9511,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -10341,13 +9529,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -10361,13 +9547,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -10381,13 +9565,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -10401,13 +9583,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -10422,13 +9602,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -10443,13 +9621,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -10464,13 +9640,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -10484,13 +9658,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -10504,13 +9676,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -10524,13 +9694,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -10545,13 +9713,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -10565,13 +9731,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -10586,13 +9750,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -10606,13 +9768,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -10626,13 +9786,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -10646,13 +9804,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -10667,13 +9823,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -10687,13 +9841,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cores": "12",
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -10711,12 +9863,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -10730,12 +9880,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -10749,12 +9897,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -10768,12 +9914,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -10787,12 +9931,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -10807,12 +9949,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -10827,12 +9967,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -10847,12 +9985,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -10866,12 +10002,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -10885,12 +10019,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -10904,12 +10036,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -10924,12 +10054,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -10943,12 +10071,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -10963,12 +10089,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -10982,12 +10106,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -11001,12 +10123,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -11020,12 +10140,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -11040,12 +10158,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -11059,12 +10175,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -11082,12 +10196,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -11101,12 +10213,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -11120,12 +10230,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -11139,12 +10247,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -11158,12 +10264,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -11178,12 +10282,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -11198,12 +10300,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -11218,12 +10318,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -11237,12 +10335,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -11256,12 +10352,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -11275,12 +10369,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -11295,12 +10387,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -11314,12 +10404,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -11334,12 +10422,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -11353,12 +10439,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -11372,12 +10456,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -11391,13 +10473,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12",
-              "pool": "WebRTC-baremetal-try"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12",
+            "pool": "WebRTC-baremetal-try"
+          }
         },
         "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
       },
@@ -11417,12 +10497,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://modules/video_coding:video_codec_perf_tests/"
       },
@@ -11436,12 +10514,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -11456,12 +10532,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -11475,12 +10549,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       },
@@ -11500,12 +10572,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_perf_tests/"
       }
@@ -11523,12 +10593,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -11542,12 +10610,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -11561,12 +10627,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -11580,12 +10644,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -11599,12 +10661,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -11619,12 +10679,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -11639,12 +10697,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -11659,12 +10715,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -11678,12 +10732,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -11697,12 +10749,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -11716,12 +10766,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -11736,12 +10784,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -11755,12 +10801,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -11775,12 +10819,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -11794,12 +10836,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -11813,12 +10853,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -11832,12 +10870,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ],
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -11852,12 +10888,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -11871,12 +10905,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac-12"
-            }
-          ]
+          "dimensions": {
+            "cpu": "arm64-64-Apple_M1",
+            "os": "Mac-12"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -11894,12 +10926,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -11913,12 +10943,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -11932,12 +10960,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -11951,12 +10977,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -11970,12 +10994,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -11990,12 +11012,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -12010,12 +11030,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -12030,12 +11048,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -12049,12 +11065,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -12068,12 +11082,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -12087,12 +11099,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -12107,12 +11117,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -12126,12 +11134,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -12146,12 +11152,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -12165,12 +11169,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -12184,12 +11186,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -12203,12 +11203,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -12223,12 +11221,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -12242,12 +11238,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -12269,12 +11263,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -12288,12 +11280,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -12307,12 +11297,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -12326,12 +11314,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -12345,12 +11331,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -12365,12 +11349,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -12385,12 +11367,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -12405,12 +11385,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -12424,12 +11402,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -12443,12 +11419,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -12462,12 +11436,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -12482,12 +11454,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -12501,12 +11471,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -12521,12 +11489,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -12540,12 +11506,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -12559,12 +11523,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -12578,12 +11540,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -12598,12 +11558,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -12617,12 +11575,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -12640,12 +11596,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -12659,12 +11613,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -12678,12 +11630,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -12697,12 +11647,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -12716,12 +11664,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -12736,12 +11682,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -12756,12 +11700,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -12776,12 +11718,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -12795,12 +11735,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -12814,12 +11752,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -12833,12 +11769,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -12853,12 +11787,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -12872,12 +11804,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -12892,12 +11822,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -12911,12 +11839,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -12930,12 +11856,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -12949,12 +11873,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -12969,12 +11891,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -12988,12 +11908,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -13011,12 +11929,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -13030,12 +11946,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -13049,12 +11963,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -13068,12 +11980,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -13087,12 +11997,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -13107,12 +12015,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -13127,12 +12033,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -13147,12 +12051,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -13166,12 +12068,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -13185,12 +12085,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -13204,12 +12102,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -13224,12 +12120,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -13243,12 +12137,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -13263,12 +12155,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -13282,12 +12172,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -13301,12 +12189,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -13320,12 +12206,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -13340,12 +12224,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -13359,12 +12241,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       }
@@ -13382,12 +12262,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
@@ -13401,12 +12279,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
@@ -13420,12 +12296,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
@@ -13439,12 +12313,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
       },
@@ -13458,12 +12330,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 2
         },
         "test_id_prefix": "ninja://modules:modules_tests/"
@@ -13478,12 +12348,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://modules:modules_unittests/"
@@ -13498,12 +12366,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
@@ -13518,12 +12384,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
@@ -13537,12 +12401,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
@@ -13556,12 +12418,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
       },
@@ -13575,12 +12435,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 6
         },
         "test_id_prefix": "ninja://:rtc_unittests/"
@@ -13595,12 +12453,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/"
       },
@@ -13614,12 +12470,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:svc_tests/"
@@ -13634,12 +12488,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
@@ -13653,12 +12505,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://test:test_support_unittests/"
       },
@@ -13672,12 +12522,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
@@ -13691,13 +12539,11 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045",
-              "pool": "WebRTC-baremetal-try"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045",
+            "pool": "WebRTC-baremetal-try"
+          }
         },
         "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
       },
@@ -13717,12 +12563,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://modules/video_coding:video_codec_perf_tests/"
       },
@@ -13736,12 +12580,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://:video_engine_tests/"
@@ -13756,12 +12598,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:voip_unittests/"
       },
@@ -13775,12 +12615,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
       },
@@ -13800,12 +12638,10 @@
           "result_format": "gtest_json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ]
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          }
         },
         "test_id_prefix": "ninja://:webrtc_perf_tests/"
       }
@@ -13823,12 +12659,10 @@
           "result_format": "json"
         },
         "swarming": {
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows-10-19045"
-            }
-          ],
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
           "shards": 4
         },
         "test_id_prefix": "ninja://pc:peerconnection_unittests/"
diff --git a/infra/specs/variants.pyl b/infra/specs/variants.pyl
index 0594c7a..cf050c6 100644
--- a/infra/specs/variants.pyl
+++ b/infra/specs/variants.pyl
@@ -46,4 +46,4 @@
       'ios_runtime_cache_16_2',
     ],
   },
-}
\ No newline at end of file
+}
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 8b9f9f7..94a72f1 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -324,7 +324,7 @@
     'machines': {
       'iOS64 Debug': {
         'mixins': [
-          'ios-device-15.7', 'webrtc-xctest', 'chrome-tester-service-account',
+          'ios-device-16.6', 'webrtc-xctest', 'chrome-tester-service-account',
           'xcode_14_main', 'mac_toolchain', 'has_native_resultdb_integration',
           'out_dir_arg'
         ],
@@ -347,7 +347,7 @@
       },
       'iOS64 Release': {
         'mixins': [
-          'ios-device-15.7', 'webrtc-xctest', 'chrome-tester-service-account',
+          'ios-device-16.6', 'webrtc-xctest', 'chrome-tester-service-account',
           'xcode_14_main', 'mac_toolchain', 'has_native_resultdb_integration',
           'out_dir_arg'
         ],