Add/update LUCI and mb configs for trybots that test inverse-fieldtrials

on the android, linux, win10, mac, iOS, chromeos platforms.
This follows the CL crrev.com/c/2580166.

The existing CI configs on android, linux, and win10 are removed as well.
(The CI test config on android will be removed via reverting crrev.com/c/2454729)

Bug: 1099916
Change-Id: I02bd3280486de170a1c8ffcd2d2f0dc6b03e3adb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2583105
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835530}

infra/config/generated/commit-queue.cfg

@@ -911,6 +911,10 @@ config_groups {
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
+      builders {
+        name: "chromium/try/ios-simulator-inverse-fieldtrials-fyi"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/ios-simulator-multi-window"
         includable_only: true
@@ -994,6 +998,10 @@ config_groups {
         name: "chromium/try/linux-chromeos-dbg"
         includable_only: true
       }
+      builders {
+        name: "chromium/try/linux-chromeos-inverse-fieldtrials-fyi-rel"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/linux-chromeos-rel"
         location_regexp: ".*"
@@ -1297,6 +1305,10 @@ config_groups {
         name: "chromium/try/mac-dawn-rel"
         includable_only: true
       }
+      builders {
+        name: "chromium/try/mac-inverse-fieldtrials-fyi-rel"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/mac-official"
         includable_only: true
@@ -1526,7 +1538,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "chromium/try/win10-inverse-fieldtrials-fyi-rel"
+        name: "chromium/try/win10_chromium_inverse_fieldtrials_x64_fyi_rel_ng"
         includable_only: true
       }
       builders {

infra/config/generated/goma-usage.pyl

@@ -3,15 +3,15 @@
 # This is consumed by presubmit checks that need to validate the config
 
 {
-  # 61750 (scheduler total) + 344750 (weighted CQ total)
+  # 61510 (scheduler total) + 344750 (weighted CQ total)
   # (weighted CQ total) = 6895 (CQ total) * 50 (CQ weight)
-  '*weighted total*': 406500,
+  '*weighted total*': 406260,
   'scheduler': {
-    '*total*': 61750,
+    '*total*': 61510,
     'triggered': {
-      '*total*': 59840,
+      '*total*': 59600,
       ('https://chromium.googlesource.com/chromium/src', 'regexp:refs/heads/master'): {
-        '*total*': 58960,
+        '*total*': 58720,
         # 4 concurrent builds x 80 jobs
         'ci/ASAN Debug': 320,
         # 5 concurrent builds x 80 jobs
@@ -245,7 +245,6 @@
         'ci/android-cronet-x86-dbg': 150,
         'ci/android-cronet-x86-rel': 150,
         'ci/android-incremental-dbg': 150,
-        'ci/android-inverse-fieldtrials-pie-x86-fyi-rel': 80,
         'ci/android-lollipop-arm-rel': 150,
         'ci/android-marshmallow-arm64-rel': 150,
         'ci/android-marshmallow-x86-rel': 150,
@@ -314,7 +313,6 @@
         'ci/linux-chromium-tests-staging-builder': 80,
         'ci/linux-fieldtrial-rel': 80,
         'ci/linux-gcc-rel': 500,
-        'ci/linux-inverse-fieldtrials-fyi-rel': 80,
         'ci/linux-lacros-builder-fyi-rel': 80,
         'ci/linux-lacros-builder-rel': 80,
         'ci/linux-official': 200,
@@ -373,7 +371,6 @@
         'ci/win-updater-builder-dbg': 80,
         'ci/win-updater-builder-rel': 80,
         'ci/win10-code-coverage': 200,
-        'ci/win10-inverse-fieldtrials-fyi-rel': 80,
         'ci/win32-archive-dbg': 200,
         'ci/win32-archive-rel': 200,
         'ci/win32-arm64-rel': 150,

infra/config/generated/luci-milo.cfg

@@ -3138,11 +3138,6 @@ consoles {
     category: "builder_tester|arm64"
     short_name: "P-WPT"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/android-inverse-fieldtrials-pie-x86-fyi-rel"
-    category: "builder_tester|x86"
-    short_name: "P-IFT"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-11-x86-fyi-rel"
     category: "emulator|11|x86"
@@ -5291,10 +5286,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/linux-fieldtrial-rel"
     category: "linux"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/linux-inverse-fieldtrials-fyi-rel"
-    category: "linux"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-lacros-builder-fyi-rel"
     category: "linux"
@@ -5407,11 +5398,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/win-pixel-tester-rel"
     category: "win10"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/win10-inverse-fieldtrials-fyi-rel"
-    category: "win10"
-    short_name: "IFT"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Win10 Tests x64 1803"
     category: "win10|1803"
@@ -11966,6 +11952,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-full-configs"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-inverse-fieldtrials-fyi"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-multi-window"
   }
@@ -12023,6 +12012,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux-chromeos-dbg"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-chromeos-inverse-fieldtrials-fyi-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/linux-chromeos-rel"
   }
@@ -12203,6 +12195,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac-dawn-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac-inverse-fieldtrials-fyi-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/mac-official"
   }
@@ -12351,7 +12346,7 @@ consoles {
     name: "buildbucket/luci.chromium.try/win10-blink-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/win10-inverse-fieldtrials-fyi-rel"
+    name: "buildbucket/luci.chromium.try/win10_chromium_inverse_fieldtrials_x64_fyi_rel_ng"
   }
   builders {
     name: "buildbucket/luci.chromium.try/win10_chromium_x64_1909_fyi_rel_ng"
@@ -12730,6 +12725,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux-chromeos-dbg"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-chromeos-inverse-fieldtrials-fyi-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/linux-chromeos-rel"
   }
@@ -13110,6 +13108,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-full-configs"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-inverse-fieldtrials-fyi"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-multi-window"
   }
@@ -13131,6 +13132,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac-arm64-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac-inverse-fieldtrials-fyi-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/mac-osxbeta-rel"
   }
@@ -13318,7 +13322,7 @@ consoles {
     name: "buildbucket/luci.chromium.try/win-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/win10-inverse-fieldtrials-fyi-rel"
+    name: "buildbucket/luci.chromium.try/win10_chromium_inverse_fieldtrials_x64_fyi_rel_ng"
   }
   builders {
     name: "buildbucket/luci.chromium.try/win10_chromium_x64_1909_fyi_rel_ng"

infra/config/generated/luci-scheduler.cfg

@@ -4487,16 +4487,6 @@ job {
     builder: "android-incremental-dbg"
   }
 }
-job {
-  id: "android-inverse-fieldtrials-pie-x86-fyi-rel"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "android-inverse-fieldtrials-pie-x86-fyi-rel"
-  }
-}
 job {
   id: "android-lollipop-arm-rel"
   realm: "ci"
@@ -5406,16 +5396,6 @@ job {
     builder: "linux-gcc-rel"
   }
 }
-job {
-  id: "linux-inverse-fieldtrials-fyi-rel"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "linux-inverse-fieldtrials-fyi-rel"
-  }
-}
 job {
   id: "linux-lacros-builder-fyi-rel"
   realm: "ci"
@@ -6257,16 +6237,6 @@ job {
     builder: "win10-code-coverage"
   }
 }
-job {
-  id: "win10-inverse-fieldtrials-fyi-rel"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "win10-inverse-fieldtrials-fyi-rel"
-  }
-}
 job {
   id: "win10-updater-tester-dbg"
   realm: "ci"
@@ -6624,7 +6594,6 @@ trigger {
   triggers: "android-cronet-x86-dbg"
   triggers: "android-cronet-x86-rel"
   triggers: "android-incremental-dbg"
-  triggers: "android-inverse-fieldtrials-pie-x86-fyi-rel"
   triggers: "android-lollipop-arm-rel"
   triggers: "android-marshmallow-arm64-rel"
   triggers: "android-marshmallow-x86-rel"
@@ -6682,7 +6651,6 @@ trigger {
   triggers: "linux-chromium-tests-staging-builder"
   triggers: "linux-fieldtrial-rel"
   triggers: "linux-gcc-rel"
-  triggers: "linux-inverse-fieldtrials-fyi-rel"
   triggers: "linux-lacros-builder-fyi-rel"
   triggers: "linux-lacros-builder-rel"
   triggers: "linux-official"
@@ -6736,7 +6704,6 @@ trigger {
   triggers: "win-updater-builder-dbg"
   triggers: "win-updater-builder-rel"
   triggers: "win10-code-coverage"
-  triggers: "win10-inverse-fieldtrials-fyi-rel"
   triggers: "win32-archive-dbg"
   triggers: "win32-archive-rel"
   triggers: "win32-arm64-rel"

infra/config/subprojects/chromium/ci.star

@@ -1000,14 +1000,6 @@ ci.android_builder(
     ),
 )
 
-ci.android_fyi_builder(
-    name = "android-inverse-fieldtrials-pie-x86-fyi-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "builder_tester|x86",
-        short_name = "P-IFT",
-    ),
-)
-
 ci.android_fyi_builder(
     name = "android-weblayer-10-x86-rel-tests",
     console_view_entry = ci.console_view_entry(
@@ -2605,13 +2597,6 @@ ci.fyi_builder(
     triggered_by = [],
 )
 
-ci.fyi_builder(
-    name = "linux-inverse-fieldtrials-fyi-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "linux",
-    ),
-)
-
 ci.fyi_builder(
     name = "linux-fieldtrial-rel",
     console_view_entry = ci.console_view_entry(
@@ -3313,16 +3298,6 @@ ci.fyi_windows_builder(
     notifies = ["annotator-rel"],
 )
 
-ci.fyi_windows_builder(
-    name = "win10-inverse-fieldtrials-fyi-rel",
-    builderless = True,
-    console_view_entry = ci.console_view_entry(
-        category = "win10",
-        short_name = "IFT",
-    ),
-    os = os.WINDOWS_10,
-)
-
 ci.gpu_linux_builder(
     name = "Android Release (Nexus 5X)",
     branch_selector = branches.STANDARD_MILESTONE,

infra/config/subprojects/chromium/try.star

@@ -693,6 +693,10 @@ try_.chromium_chromiumos_builder(
     ),
 )
 
+try_.chromium_chromiumos_builder(
+    name = "linux-chromeos-inverse-fieldtrials-fyi-rel",
+)
+
 try_.chromium_chromiumos_builder(
     name = "linux-chromeos-rel",
     branch_selector = branches.ALL_BRANCHES,
@@ -1259,6 +1263,11 @@ try_.chromium_mac_builder(
     os = os.MAC_DEFAULT,
 )
 
+try_.chromium_mac_builder(
+    name = "mac-inverse-fieldtrials-fyi-rel",
+    os = os.MAC_DEFAULT,
+)
+
 try_.chromium_mac_builder(
     name = "mac-rel",
     branch_selector = branches.STANDARD_MILESTONE,
@@ -1383,6 +1392,10 @@ try_.chromium_mac_ios_builder(
     ),
 )
 
+try_.chromium_mac_ios_builder(
+    name = "ios-simulator-inverse-fieldtrials-fyi",
+)
+
 try_.chromium_mac_ios_builder(
     name = "ios-simulator-multi-window",
 )
@@ -1530,6 +1543,11 @@ try_.chromium_win_builder(
     os = os.WINDOWS_10,
 )
 
+try_.chromium_win_builder(
+    name = "win10_chromium_inverse_fieldtrials_x64_fyi_rel_ng",
+    os = os.WINDOWS_10,
+)
+
 try_.chromium_win_builder(
     name = "win10_chromium_x64_rel_ng",
     branch_selector = branches.STANDARD_MILESTONE,
@@ -1550,11 +1568,6 @@ try_.chromium_win_builder(
     os = os.WINDOWS_ANY,
 )
 
-try_.chromium_win_builder(
-    name = "win10-inverse-fieldtrials-fyi-rel",
-    os = os.WINDOWS_10,
-)
-
 try_.chromium_win_builder(
     name = "win7-rel",
     branch_selector = branches.STANDARD_MILESTONE,

testing/buildbot/waterfalls.pyl

@@ -2658,14 +2658,6 @@
           'gtest_tests': 'fieldtrial_browser_tests',
         },
       },
-      'linux-inverse-fieldtrials-fyi-rel': {
-        'mixins': [
-          'linux-xenial',
-        ],
-        'test_suites': {
-          'gtest_tests': 'chromium_linux_gtests',
-        },
-      },
       'linux-lacros-tester-fyi-rel': {
         'additional_compile_targets': [
           'chrome',
@@ -2956,14 +2948,6 @@
           'gtest_tests': 'chromium_win_gtests',
         },
       },
-      'win10-inverse-fieldtrials-fyi-rel': {
-        'mixins': [
-          'win10',
-        ],
-        'test_suites': {
-          'gtest_tests': 'chromium_win_gtests',
-        },
-      },
       'win7-blink-rel-dummy': {
         'swarming': {
           'dimension_sets': [

tools/mb/mb_config.pyl

@@ -133,7 +133,6 @@
     'chromium.android.fyi': {
       'Android WebView P FYI (rel)': 'android_release_bot_minimal_symbols_arm64_webview_google',
       'android-11-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
-      'android-inverse-fieldtrials-pie-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google_invert_fieldtrials',
       'android-pie-arm64-wpt-rel-non-cq': 'android_release_bot_minimal_symbols_arm64_webview_google',
       'android-weblayer-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
     },
@@ -337,10 +336,6 @@
       'win32-archive-rel-goma-rbe-canary': 'release_bot_x86_minimal_symbols_enable_archive_compression',
       'win32-archive-rel-goma-rbe-latest': 'release_bot_x86_minimal_symbols_enable_archive_compression',
       'win32-arm64-rel': 'win32_arm64_release_bot',
-
-      # Builders to test inversed fieldtrials
-      'linux-inverse-fieldtrials-fyi-rel': 'gpu_tests_release_bot_minimal_symbols_invert_fieldtrials',
-      'win10-inverse-fieldtrials-fyi-rel': 'gpu_tests_release_bot_minimal_symbols_invert_fieldtrials',
     },
 
     'chromium.goma.fyi': {
@@ -899,6 +894,7 @@
       'chromeos-kevin-rel': 'chromeos_kevin',
       'gpu-fyi-try-chromeos-amd64-generic': 'gpu_tests_chromeos_amd64_release_trybot_dcheck_off_no_symbols',
       'gpu-fyi-try-chromeos-kevin': 'gpu_tests_chromeos_kevin_release_trybot_dcheck_off_no_symbols',
+      'linux-chromeos-inverse-fieldtrials-fyi-rel': 'chromeos_with_codecs_release_trybot_invert_fieldtrials',
       'linux-chromeos-rel': 'chromeos_with_codecs_release_trybot_code_coverage',
       'linux-chromeos-compile-dbg': 'chromeos_with_codecs_debug_bot',
       'linux-chromeos-dbg': 'chromeos_with_codecs_debug_bot',
@@ -1043,6 +1039,7 @@
       'ios-simulator-full-configs': 'ios_simulator_code_coverage_partial_instrumentation_xctest',
       'ios-simulator-cronet': 'ios_cronet_xctest',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot_xctest',
+      'ios-simulator-inverse-fieldtrials-fyi': 'ios_simulator_debug_static_bot_invert_fieldtrials_xctest',
       'ios-simulator-noncq': 'ios_simulator_debug_static_bot_xctest',
       'ios-simulator-multi-window': 'ios_simulator_debug_static_bot_multi_window_xctest',
       'mac-osxbeta-rel': 'gpu_tests_release_trybot_deterministic_mac',
@@ -1059,6 +1056,7 @@
       'mac_chromium_dbg_ng': 'gpu_tests_debug_bot',
       'mac_optional_gpu_tests_rel': 'gpu_fyi_tests_release_trybot',
       'mac_upload_clang': 'release_bot',
+      'mac-inverse-fieldtrials-fyi-rel': 'gpu_tests_release_trybot_deterministic_mac_invert_fieldtrials',
       'mac-rel': 'gpu_tests_release_trybot_deterministic_mac_code_coverage',
       'mac-arm64-rel': 'mac_arm64_release_trybot',
     },
@@ -1116,10 +1114,10 @@
       'gpu-fyi-try-win10-nvidia-rel-32': 'gpu_fyi_tests_release_trybot_x86',
       'gpu-fyi-try-win10-nvidia-rel-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-nvidia-sk-dawn-rel-64': 'gpu_tests_sk_dawn_release_trybot',
+      'win10_chromium_inverse_fieldtrials_x64_fyi_rel_ng': 'gpu_tests_release_trybot_resource_whitelisting_invert_fieldtrials',
       'win10_chromium_x64_dbg_ng': 'gpu_tests_debug_bot',
       'win10_chromium_x64_rel_ng': 'gpu_tests_release_trybot_resource_whitelisting_code_coverage',
       'win10_chromium_x64_rel_ng_exp': 'release_trybot',
-      'win10-inverse-fieldtrials-fyi-rel': 'gpu_tests_release_trybot_invert_fieldtrials',
       'win-annotator-rel': 'release_trybot',
       'win-asan': 'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release',
       'win-celab-try-rel': 'release_bot_minimal_symbols',
@@ -1375,12 +1373,6 @@
       'strip_debug_info', 'android_fastbuild', 'webview_google',
     ],
 
-    'android_release_bot_minimal_symbols_x86_fastbuild_webview_google_invert_fieldtrials': [
-      'android', 'release_bot', 'minimal_symbols', 'x86',
-      'strip_debug_info', 'android_fastbuild', 'webview_google',
-      'invert_fieldtrials',
-    ],
-
     'android_release_trybot': [
       'android', 'release_trybot', 'strip_debug_info',
     ],
@@ -1695,6 +1687,10 @@
       'use_clang_coverage', 'partial_code_coverage_instrumentation',
     ],
 
+    'chromeos_with_codecs_release_trybot_invert_fieldtrials': [
+      'chromeos_with_codecs', 'release_trybot', 'no_symbols', 'invert_fieldtrials',
+    ],
+
     'clang_code_coverage': [
       'release_bot', 'clang', 'use_clang_coverage', 'no_symbols',
     ],
@@ -2023,10 +2019,6 @@
       'partial_code_coverage_instrumentation',
     ],
 
-    'gpu_tests_release_bot_minimal_symbols_invert_fieldtrials': [
-      'gpu_tests', 'release_bot', 'minimal_symbols', 'invert_fieldtrials',
-    ],
-
     'gpu_tests_release_bot_minimal_symbols_no_nacl': [
       'gpu_tests', 'release_bot', 'minimal_symbols', 'disable_nacl',
     ],
@@ -2054,8 +2046,8 @@
       'use_clang_coverage', 'partial_code_coverage_instrumentation',
     ],
 
-    'gpu_tests_release_trybot_invert_fieldtrials': [
-      'gpu_tests', 'release_trybot', 'invert_fieldtrials',
+    'gpu_tests_release_trybot_deterministic_mac_invert_fieldtrials': [
+      'gpu_tests', 'release_trybot', 'mac_deterministic_build', 'invert_fieldtrials',
     ],
 
     'gpu_tests_release_trybot_resource_whitelisting': [
@@ -2070,6 +2062,10 @@
       'use_clang_coverage', 'partial_code_coverage_instrumentation',
     ],
 
+    'gpu_tests_release_trybot_resource_whitelisting_invert_fieldtrials': [
+      'gpu_tests', 'release_trybot', 'resource_whitelisting', 'invert_fieldtrials',
+    ],
+
     'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange': [
       'gpu_tests', 'release_trybot', 'no_symbols', 'use_dummy_lastchange',
     ],
@@ -2134,6 +2130,10 @@
         'debug_static_bot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest',
     ],
 
+    'ios_simulator_debug_static_bot_invert_fieldtrials_xctest': [
+        'debug_static_bot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'invert_fieldtrials', 'xctest',
+    ],
+
     'ios_simulator_debug_static_bot_multi_window_xctest': [
         'debug_static_bot', 'ios_enable_multi_window', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest',
     ],

tools/mb/mb_config_expectations/chromium.android.fyi.json

@@ -29,23 +29,6 @@
       "use_goma": true
     }
   },
-  "android-inverse-fieldtrials-pie-x86-fyi-rel": {
-    "gn_args": {
-      "disable_android_lint": true,
-      "ffmpeg_branding": "Chrome",
-      "invert_fieldtrials": true,
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "strip_debug_info": true,
-      "symbol_level": 1,
-      "system_webview_package_name": "com.google.android.webview",
-      "target_cpu": "x86",
-      "target_os": "android",
-      "use_errorprone_java_compiler": false,
-      "use_goma": true
-    }
-  },
   "android-pie-arm64-wpt-rel-non-cq": {
     "gn_args": {
       "ffmpeg_branding": "Chrome",

tools/mb/mb_config_expectations/chromium.fyi.json

@@ -609,17 +609,6 @@
       "use_goma": true
     }
   },
-  "linux-inverse-fieldtrials-fyi-rel": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "invert_fieldtrials": true,
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
   "linux-lacros-builder-fyi-rel": {
     "gn_args": {
       "also_build_ash_chrome": true,
@@ -832,17 +821,6 @@
       "use_goma": true
     }
   },
-  "win10-inverse-fieldtrials-fyi-rel": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "invert_fieldtrials": true,
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
   "win32-archive-rel-goma-rbe-canary": {
     "gn_args": {
       "is_component_build": false,

tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json

@@ -112,6 +112,19 @@
       "use_goma": true
     }
   },
+  "linux-chromeos-inverse-fieldtrials-fyi-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "ChromeOS",
+      "invert_fieldtrials": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 0,
+      "target_os": "chromeos",
+      "use_goma": true
+    }
+  },
   "linux-chromeos-rel": {
     "gn_args": {
       "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",

tools/mb/mb_config_expectations/tryserver.chromium.mac.json

@@ -300,6 +300,19 @@
       "use_goma": true
     }
   },
+  "ios-simulator-inverse-fieldtrials-fyi": {
+    "gn_args": {
+      "enable_run_ios_unittests_with_xctest": true,
+      "invert_fieldtrials": true,
+      "is_component_build": false,
+      "is_debug": true,
+      "symbol_level": 1,
+      "target_cpu": "x64",
+      "target_environment": "simulator",
+      "target_os": "ios",
+      "use_goma": true
+    }
+  },
   "ios-simulator-multi-window": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
@@ -383,6 +396,19 @@
       "use_goma": true
     }
   },
+  "mac-inverse-fieldtrials-fyi-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "invert_fieldtrials": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "mac_deterministic_build": true,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "mac-osxbeta-rel": {
     "gn_args": {
       "dcheck_always_on": true,

tools/mb/mb_config_expectations/tryserver.chromium.win.json

@@ -282,9 +282,10 @@
       "use_libfuzzer": true
     }
   },
-  "win10-inverse-fieldtrials-fyi-rel": {
+  "win10_chromium_inverse_fieldtrials_x64_fyi_rel_ng": {
     "gn_args": {
       "dcheck_always_on": true,
+      "enable_resource_allowlist_generation": true,
       "ffmpeg_branding": "Chrome",
       "invert_fieldtrials": true,
       "is_component_build": false,