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

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

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2014 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.
 
 # This is the buildmaster config file for the 'chromium' bot. It must
 # be installed as 'master.cfg' in your buildmaster's base directory
 # (although the filename can be changed with the --basedir option to
@@ skipping 70 matching lines @@
 # Schedulers.
 
 ## configure the Schedulers
 
 # "FYI" is part of the Win builder name to avoid overwriting the main perf
 # waterfall's Win builds. It should be removed once this builder is migrated to
 # chromium.perf.
 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',
     ['Linux Large Profile Generator Perf',
      'Linux CT Top1K RR Perf',
 ])
 
 s_chromium_winrel_x64_trigger = Triggerable('winrel_x64',
                                             ['Win 7 Intel GPU Perf (Xeon)',
                                              'Win Large Profile Generator Perf',
@@ skipping 22 matching lines @@
 #  builddir (required): which subdirectory to run the builder in
 #  factory (required): a BuildFactory to define how the build is run
 #  periodicBuildTime (optional): if set, force a build every N seconds
 #  category (optional): it is not used in the normal 'buildbot' meaning. It is
 #                       used by gatekeeper to determine which steps it should
 #                       look for to close the tree.
 #
 
 # 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',
       triggers=['winrel_x64'],
       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'] = [
-  b_chromium_rel_win_x64_builder,
-  b_webview_aosp_android,
-]
+c['builders'].append({
+  'name': 'WebView Nexus5X Perf (1)',
+  'factory': recipe_factory('android/perf'),
+  'category': '2android|builder_testers',
+  'triggered': True,
+})
+
+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
 
 # 5. Linux
 
 # 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
 
 c['builders'].append({'name': 'Win Large Profile Generator Perf',
   'factory': annotator_factory.AnnotatorFactory(ActiveMaster).BaseFactory(
       recipe='perf/telemetry_generate_large_profile',
       timeout=24 * 3600),
   'category': '7large profile generator|testers',
 })
 
@@ skipping 63 matching lines @@
 
 ####### PROJECT IDENTITY
 
 # the 'projectName' string will be used to describe the project that this
 # buildbot is working on. For example, it is used as the title of the
 # waterfall HTML page. The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 
 c['projectName'] = ActiveMaster.project_name
 c['projectURL'] = config.Master.project_url