[ios] Remove override of ios_use_goma_rbe gn variable

The gn variable ios_use_goma_rbe is ignored since the CL
https://crrev.com/c/2555117 landed, so stop overriding
it on the bots (it is now always enabled which is what
the bots want).

Bug: none
Change-Id: I76e2c9180da9396fd206efb8592990f231841115
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2558437
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#835291}

tools/mb/mb_config.pyl

@@ -292,17 +292,17 @@
       'fuchsia-fyi-x64-dbg': 'debug_bot_fuchsia',
       'fuchsia-fyi-x64-rel': 'release_bot_fuchsia',
       'ios13-beta-simulator': 'ios_simulator_debug_static_bot_xctest',
-      'ios13-sdk-device': 'ios_device_release_static_rbe_bot_xctest',
-      'ios13-sdk-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios13-sdk-device': 'ios_device_release_static_bot_xctest',
+      'ios13-sdk-simulator': 'ios_simulator_debug_static_bot_xctest',
       'ios14-beta-simulator': 'ios_simulator_debug_static_bot_xctest',
-      'ios14-sdk-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios14-sdk-simulator': 'ios_simulator_debug_static_bot_xctest',
       'ios-asan': 'ios_simulator_release_static_asan_bot_xctest',
       'ios-simulator': 'ios_error',
       'ios-simulator-code-coverage': 'clang_code_coverage_ios_xctest',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot_xctest',
       'ios-simulator-cronet': 'ios_cronet_xctest',
       'ios-simulator-multi-window': 'ios_simulator_debug_static_bot_multi_window_xctest',
-      'ios-webkit-tot': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios-webkit-tot': 'ios_simulator_debug_static_bot_xctest',
       'linux-annotator-rel': 'release_bot',
       'linux-blink-animation-use-time-delta': 'debug_bot_enable_blink_animation_use_time_delta',
       'linux-blink-heap-concurrent-marking-tsan-rel': 'release_trybot_tsan',
@@ -392,8 +392,8 @@
 
       'ios-device-goma-canary-clobber': 'ios_device_release_compile_only',
       'ios-device-goma-latest-clobber': 'ios_device_release_compile_only',
-      'ios-device-goma-rbe-canary-clobber': 'ios_device_release_rbe_compile_only',
-      'ios-device-goma-rbe-latest-clobber': 'ios_device_release_rbe_compile_only',
+      'ios-device-goma-rbe-canary-clobber': 'ios_device_release_compile_only',
+      'ios-device-goma-rbe-latest-clobber': 'ios_device_release_compile_only',
       'linux-archive-rel-goma-canary': 'release_bot',
       'linux-archive-rel-goma-canary-localoutputcache': 'release_bot',
       'linux-archive-rel-goma-latest': 'release_bot',
@@ -526,10 +526,10 @@
     'chromium.mac': {
       'Mac Builder': 'gpu_tests_release_bot_minimal_symbols_no_nacl',
       'Mac Builder (dbg)': 'gpu_tests_debug_bot',
-      'ios-device': 'ios_device_release_rbe_compile_only',
-      'ios-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios-device': 'ios_device_release_compile_only',
+      'ios-simulator': 'ios_simulator_debug_static_bot_xctest',
       'ios-simulator-full-configs': 'ios_simulator_debug_static_bot_xctest',
-      'ios-simulator-noncq': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios-simulator-noncq': 'ios_simulator_debug_static_bot_xctest',
       'mac-arm64-rel': 'mac_arm64_release_bot',
     },
 
@@ -1034,16 +1034,16 @@
       'gpu-fyi-try-mac-nvidia-retina-rel': 'gpu_fyi_tests_release_trybot',
       'gpu-try-mac-amd-retina-dbg': 'gpu_tests_debug_bot',
       'gpu-try-mac-intel-dbg': 'gpu_tests_debug_bot',
-      'ios-device': 'ios_device_release_rbe_compile_only',
-      'ios13-beta-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
-      'ios13-sdk-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
-      'ios14-beta-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
-      'ios14-sdk-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
-      'ios-simulator': 'ios_simulator_rbe_code_coverage_partial_instrumentation_xctest',
+      'ios-device': 'ios_device_release_compile_only',
+      'ios13-beta-simulator': 'ios_simulator_debug_static_bot_xctest',
+      'ios13-sdk-simulator': 'ios_simulator_debug_static_bot_xctest',
+      'ios14-beta-simulator': 'ios_simulator_debug_static_bot_xctest',
+      'ios14-sdk-simulator': 'ios_simulator_debug_static_bot_xctest',
+      'ios-simulator': 'ios_simulator_code_coverage_partial_instrumentation_xctest',
       '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-noncq': 'ios_simulator_debug_static_rbe_bot_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',
       'mac_chromium_10.11_rel_ng': 'gpu_tests_release_trybot_deterministic_mac',
@@ -1700,17 +1700,13 @@
     ],
 
     'clang_code_coverage_ios_xctest': [
-      'use_clang_coverage', 'debug_static_bot', 'x64', 'ios', 'ios_use_goma_rbe', 'xctest',
+      'use_clang_coverage', 'debug_static_bot', 'x64', 'ios', 'xctest',
     ],
 
     'ios_simulator_code_coverage_partial_instrumentation_xctest': [
       'use_clang_coverage', 'debug_static_bot', 'x64', 'ios', 'ios_simulator', 'partial_code_coverage_instrumentation', 'xctest',
     ],
 
-    'ios_simulator_rbe_code_coverage_partial_instrumentation_xctest': [
-      'use_clang_coverage', 'debug_static_bot', 'x64', 'ios', 'ios_simulator', 'ios_use_goma_rbe', 'partial_code_coverage_instrumentation', 'xctest',
-    ],
-
     'clang_tot_asan_lsan_static_release': [
       'clang_tot', 'asan', 'lsan', 'static', 'release',
     ],
@@ -2129,13 +2125,9 @@
         'compile_only', 'ios', 'ios_device', 'ios_cpu_arm64', 'ios_google_cert', 'ios_disable_code_signing', 'release_bot'
     ],
 
-    'ios_device_release_rbe_compile_only': [
-        'compile_only', 'ios', 'ios_device', 'ios_cpu_arm64', 'ios_google_cert', 'ios_disable_code_signing', 'ios_use_goma_rbe', 'release_bot'
-    ],
-
     # doesn't have symbol_level=0
-    'ios_device_release_static_rbe_bot_xctest': [
-        'ios', 'ios_device', 'ios_cpu_arm64', 'ios_disable_code_signing', 'ios_use_goma_rbe', 'release_bot', 'xctest',
+    'ios_device_release_static_bot_xctest': [
+        'ios', 'ios_device', 'ios_cpu_arm64', 'ios_disable_code_signing', 'release_bot', 'xctest',
     ],
 
     'ios_simulator_debug_static_bot_xctest': [
@@ -2146,10 +2138,6 @@
         'debug_static_bot', 'ios_enable_multi_window', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest',
     ],
 
-    'ios_simulator_debug_static_rbe_bot_xctest': [
-        'debug_static_bot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'ios_use_goma_rbe', 'xctest',
-    ],
-
     'ios_simulator_release_static_asan_bot_xctest': [
         'ios', 'ios_simulator', 'ios_cpu_x64', 'release_bot', 'asan', 'xctest',
     ],
@@ -2980,10 +2968,6 @@
       'gn_args': 'ios_enable_multi_window=true'
     },
 
-    'ios_use_goma_rbe': {
-      'gn_args': 'ios_use_goma_rbe=true'
-    },
-
     'mojo_fuzzer': {
       'gn_args': 'enable_mojom_fuzzer=true',
     },

tools/mb/mb_config_expectations/chromium.fyi.json

@@ -377,7 +377,6 @@
   "ios-simulator-code-coverage": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -441,7 +440,6 @@
   "ios-webkit-tot": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -467,7 +465,6 @@
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
       "ios_enable_code_signing": false,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": false,
       "target_cpu": "arm64",
@@ -479,7 +476,6 @@
   "ios13-sdk-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -504,7 +500,6 @@
   "ios14-sdk-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,

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

@@ -341,7 +341,6 @@
     "gn_args": {
       "ios_code_signing_identity_description": "Apple Development",
       "ios_enable_code_signing": false,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": false,
       "symbol_level": 0,
@@ -355,7 +354,6 @@
     "gn_args": {
       "ios_code_signing_identity_description": "Apple Development",
       "ios_enable_code_signing": false,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": false,
       "symbol_level": 0,

tools/mb/mb_config_expectations/chromium.mac.json

@@ -24,7 +24,6 @@
     "gn_args": {
       "ios_code_signing_identity_description": "Apple Development",
       "ios_enable_code_signing": false,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": false,
       "symbol_level": 0,
@@ -37,7 +36,6 @@
   "ios-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -62,7 +60,6 @@
   "ios-simulator-noncq": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,

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

@@ -225,7 +225,6 @@
     "gn_args": {
       "ios_code_signing_identity_description": "Apple Development",
       "ios_enable_code_signing": false,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": false,
       "symbol_level": 0,
@@ -239,7 +238,6 @@
     "gn_args": {
       "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -318,7 +316,6 @@
   "ios-simulator-noncq": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -331,7 +328,6 @@
   "ios13-beta-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -344,7 +340,6 @@
   "ios13-sdk-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -357,7 +352,6 @@
   "ios14-beta-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -370,7 +364,6 @@
   "ios14-sdk-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,