Revert of Switch chromium.perf Android Nexus5X over to chromium recipe

masters/master.chromium.perf/master.cfg

 # Copyright 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.
 
 # This is the buildmaster config file for the 'chromium.perf' 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
 # 'mktap buildbot master').
 
 # It has one job: define a dictionary named BuildmasterConfig. This
@@ skipping 142 matching lines @@
       'category': '%d%s|builder_testers' % (_CategoryIndex(platform), platform),
   })
 
   if bb_trigger:
     trigger_name = _TriggerName(platform, target_bits)
     if trigger_name not in _trigger_testers:
       _trigger_testers[trigger_name] = []
     _trigger_testers[trigger_name].append(name)
 
 
-def _AddTester(name, platform, num_shards=1, target_bits=64, recipe=None):
+def _AddTester(name, platform, num_shards=1, target_bits=64):
   if platform == 'android':
-    recipe = recipe or 'android/perf'
+    factory = m_remote_run_chromium_src('android/perf')
     bb_trigger = True
   else:
-    recipe = recipe or 'chromium'
+    factory = m_remote_run_chromium_src('chromium')
     bb_trigger = False
 
-  factory = m_remote_run_chromium_src(recipe)
-
   if num_shards == 1:
     _AddTesterShard(name, factory, platform, target_bits, bb_trigger=bb_trigger)
   else:
     for index in xrange(num_shards):
       indexed_name = '%s (%d)' % (name, index + 1)
       _AddTesterShard(
           indexed_name, factory, platform, target_bits, bb_trigger=bb_trigger)
 
 
 c['builders'] = []
 
 
 _AddBuilder('Android Builder', 'android', target_bits=32)
 _AddBuilder('Android Compile', 'android', target_bits=32, recipe='chromium')
 _AddBuilder('Android arm64 Builder', 'android')
 _AddBuilder('Win Builder', 'win', timeout=3600, target_bits=32)
 # TODO(dtu): decrease the timeout when https://crbug.com/617982 is fixed.
 _AddBuilder('Win x64 Builder', 'win', timeout=7200)
 _AddBuilder('Mac Builder', 'mac')
 # TODO(krasin): decrease the timeout when https://crbug.com/569732 is fixed.
 _AddBuilder('Linux Builder', 'linux', timeout=4800)
 
 
 _AddTester('Android Galaxy S5 Perf', 'android', num_shards=3, target_bits=32)
 _AddTester('Android Nexus5 Perf', 'android', num_shards=3, target_bits=32)
-_AddTester('Android Nexus5X Perf', 'android', num_shards=3, recipe='chromium')
+_AddTester('Android Nexus5X Perf', 'android', num_shards=3)
 _AddTester('Android Nexus6 Perf', 'android', num_shards=3, target_bits=32)
 _AddTester('Android Nexus7v2 Perf', 'android', num_shards=3, target_bits=32)
 _AddTester('Android Nexus9 Perf', 'android', num_shards=3)
 _AddTester('Android One Perf', 'android', num_shards=3, target_bits=32)
 _AddTester('Android Nexus5X WebView Perf', 'android', num_shards=3)
 _AddTester('Android Nexus6 WebView Perf', 'android', num_shards=3,
            target_bits=32)
 
 
 _AddTester('Win Zenbook Perf', 'win', num_shards=5)
@@ skipping 80 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