Recipe changes to move webview perf bots to the android/perf recipe

masters/master.chromium.perf.fyi/master.cfg

Index: masters/master.chromium.perf.fyi/master.cfg
diff --git a/masters/master.chromium.perf.fyi/master.cfg b/masters/master.chromium.perf.fyi/master.cfg
index 5e3bd7ffd3a8bdc42ae0b3a331b0733c2bb30c2c..f92a82c9a0f38c889e592832d5c7dd6587763fbc 100644
--- a/masters/master.chromium.perf.fyi/master.cfg
+++ b/masters/master.chromium.perf.fyi/master.cfg
@@ -88,10 +88,8 @@ c['change_source'] = [master_poller]
 s_chromium = Scheduler(name='chromium',
                        branch='master',
                        treeStableTimer=60,
-                       builderNames=['android_webview_aosp_perf',
-                                     'Win x64 FYI Builder',
-                                     'Win Clang Builder',
-                                    ])
+                       builderNames=['Win x64 FYI Builder',
+                                     'Win Clang Builder'])
 
 s_chromium_linux_rel_trigger = Triggerable(
     'linuxrel',
@@ -134,7 +132,7 @@ c['builders'] = []
 
 # 1. Builders
 
-b_chromium_rel_win_x64_builder = {'name': 'Win x64 FYI Builder',
+c['builders'].append({'name': 'Win x64 FYI Builder',
   'builddir': 'chromium-rel-x64-fyi-builder',
   'factory': annotator_factory.AnnotatorFactory(ActiveMaster).BaseFactory(
       recipe='chromium',
@@ -142,26 +140,37 @@ b_chromium_rel_win_x64_builder = {'name': 'Win x64 FYI Builder',
       timeout=7200),
   'category': '1builders|windows',
   'auto_reboot': False,
-}
+})
 
 # 2. Android
 
-b_webview_aosp_android = {'name': 'android_webview_aosp_perf',
-  'factory': recipe_factory('android_webview_aosp_perf'),
+c['builders'].append({
+  'name': 'WebView Nexus5 Perf (1)',
+  'factory': recipe_factory('android/perf'),
+  'category': '2android|builder_testers',
+  'triggered': True
+})
+
+c['builders'].append({
+  'name': 'WebView Nexus5X Perf (1)',
+  'factory': recipe_factory('android/perf'),
   'category': '2android|builder_testers',
-}
+  'triggered': True,
+})
 
-c['builders'] = [
-  b_chromium_rel_win_x64_builder,
-  b_webview_aosp_android,
-]
+c['builders'].append({
+  'name': 'WebView Nexus5X Perf (2)',
+  'factory': recipe_factory('android/perf'),
+  'category': '2android|builder_testers',
+  'triggered': True,
+})
 
 # 3. Windows
 
 c['builders'].append({'name': 'Win 7 Intel GPU Perf (Xeon)',
-    'factory': recipe_factory('chromium'),
-    'category': '3windows|builder_testers',
-    })
+  'factory': recipe_factory('chromium'),
+  'category': '3windows|builder_testers',
+})
 
 # 4. Mac
 
@@ -169,23 +178,20 @@ c['builders'].append({'name': 'Win 7 Intel GPU Perf (Xeon)',
 
 # 6. Win Clang
 
-b_chromium_win_clang_builder = {
+c['builders'].append({
   'name': 'Win Clang Builder',
   'factory': annotator_factory.AnnotatorFactory(ActiveMaster).BaseFactory(
       recipe='chromium',
       triggers=['win_clang']),
   'category': '6win clang|builders',
   'auto_reboot': False,
-}
+})
 
-b_chromium_win_clang_perf = {
+c['builders'].append({
   'name': 'Win Clang Perf',
   'factory': recipe_factory('chromium'),
   'category': '6win clang|builder_testers',
-}
-
-c['builders'].append(b_chromium_win_clang_builder)
-c['builders'].append(b_chromium_win_clang_perf)
+})
 
 # 7. Large Profile Generator