Move CrWinClang and Tester to recipes.

masters/master.chromium.fyi/master.cfg

Index: masters/master.chromium.fyi/master.cfg
diff --git a/masters/master.chromium.fyi/master.cfg b/masters/master.chromium.fyi/master.cfg
index 542703b164d28a4bbe94adc33a5dfdd78c966999..f7115a3a94d70038393d44046563af673cb13e3b 100644
--- a/masters/master.chromium.fyi/master.cfg
+++ b/masters/master.chromium.fyi/master.cfg
@@ -323,8 +323,6 @@ chromium_linux_arm_archive = master_config.GetGSUtilUrl(
 chromium_android_fyi_dbg_archive = master_config.GetGSUtilUrl(
     'chromium-android', 'android_fyi_dbg')
 
-chromium_win_clang_archive = master_config.GetGSUtilUrl(
-    'chromium-build-transfer', 'CrWinClang')
 chromium_win_clang_dbg_archive = master_config.GetGSUtilUrl(
     'chromium-build-transfer', 'CrWinClang(dbg)')
 chromium_win_clang_shared_archive = master_config.GetGSUtilUrl(
@@ -767,21 +765,6 @@ f_chromium_win_x64 = win_out().ChromiumFactory(
 
 win_clang_tests = tests_win_1 + tests_win_2 + ['content_unittests']
 
-f_chromium_win_clang = win_out().ChromiumFactory(
-    slave_type='Builder',
-    target='Release',
-    factory_properties={
-      'build_url': chromium_win_clang_archive,
-      'trigger': 'cr_win_clang',
-      'gclient_env': {
-        'GYP_DEFINES': 'clang=1',
-    }})
-f_chromium_win_clang_tester = win_out().ChromiumFactory(
-    build_url=chromium_win_clang_archive,
-    slave_type='Tester',
-    target='Release',
-    tests=win_clang_tests)
-
 f_chromium_win_clang_dbg = win_out().ChromiumFactory(
     slave_type='Builder',
     target='Debug',
@@ -1392,13 +1375,13 @@ b_chromium_win_x64 = {
 
 b_chromium_win_clang = {
   'name': 'CrWinClang',
-  'factory': f_chromium_win_clang,
+  'factory': m_annotator.BaseFactory('chromium', triggers=['cr_win_clang']),
   'category': 'win clang',
   'auto_reboot': False,
 }
 b_chromium_win_clang_tester = {
   'name': 'CrWinClang tester',
-  'factory': f_chromium_win_clang_tester,
+  'factory': m_annotator.BaseFactory('chromium'),
   'category': 'win clang',
   'auto_reboot': False,
 }