Revert "chromium.fyi: convert ios/unified_builder_tester builders to remote_run"

masters/master.chromium.fyi/master.cfg

 # vim: ft=python:
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from buildbot.changes.filter import ChangeFilter
 from buildbot.process.properties import WithProperties
 from buildbot.scheduler import Dependent
 from buildbot.scheduler import Nightly
 from buildbot.scheduler import Periodic
@@ skipping 779 matching lines @@
 }
 b_clang_tot_mac_asan_tester = {
   'name': 'ClangToTMacASan tester',
   'factory': m_remote_run_chromium_src('chromium'),
   'category': 'clang tot',
   'auto_reboot': True,
 }
 
 b_clang_tot_ios = {
   'name': 'ClangToTiOS',
-  'factory': m_remote_run('ios/unified_builder_tester'),
+  'factory': annotator_factory.AnnotatorFactory().BaseFactory(
+    'ios/unified_builder_tester'
+  ),
   'category': 'clang tot',
   'auto_reboot': True,
 }
 
 b_clang_tot_win = {
   'name': 'ClangToTWin',
   'factory': m_remote_run_chromium_src('chromium', triggers=['clang_tot_win']),
   'category': 'clang tot',
   'auto_reboot': True,
 }
@@ skipping 399 matching lines @@
 b_chromium_libfuzzer_upload_mac_asan = {
   'name': 'Libfuzzer Upload Mac ASan',
   'factory': m_annotator.BaseFactory('chromium_libfuzzer',
                                      timeout=24000),
   'category': 'chromium_libfuzzer',
   'auto_reboot': True,
 }
 
 b_earlgrey_ios = {
   'name': 'EarlGreyiOS',
-  'factory': m_remote_run('ios/unified_builder_tester'),
+  'factory': annotator_factory.AnnotatorFactory().BaseFactory(
+    'ios/unified_builder_tester'
+  ),
   'category': 'earlgrey',
   'auto_reboot': True,
 }
 
 b_gomacanary_ios = {
   'name': 'GomaCanaryiOS',
-  'factory': m_remote_run('ios/unified_builder_tester'),
+  'factory': annotator_factory.AnnotatorFactory().BaseFactory(
+    'ios/unified_builder_tester'
+  ),
   'category': 'goma',
   'auto_reboot': True,
 }
 
 b_mojo_chromiumos = {
   'name': 'Mojo ChromiumOS',
   'factory': m_remote_run_chromium_src('chromium'),
   'category': 'mojo',
   'auto_reboot': True,
 }
@@ skipping 311 matching lines @@
       ]))
 
 c['status'].append(MailNotifier(
       fromaddr=ActiveMaster.from_address,  # Reply-To address
       mode='failing',
       relayhost=config.Master.smtp,
       subject='Build failure on %(builder)s',
       extraRecipients=['sbc@chromium.org'],
       sendToInterestedUsers=False,
       builders=['Linux ARM']))