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

masters/master.chromium.perf/master.cfg

Index: masters/master.chromium.perf/master.cfg
diff --git a/masters/master.chromium.perf/master.cfg b/masters/master.chromium.perf/master.cfg
index 4213711ebde2ce2d55ae0228669f716367d6033d..f4809bdc46e16421c3e5e7d74a967fae1daea440 100644
--- a/masters/master.chromium.perf/master.cfg
+++ b/masters/master.chromium.perf/master.cfg
@@ -160,14 +160,16 @@ def _AddTesterShard(name, factory, platform, target_bits, bb_trigger=False):
     _trigger_testers[trigger_name].append(name)
 
 
-def _AddTester(name, platform, num_shards=1, target_bits=64):
+def _AddTester(name, platform, num_shards=1, target_bits=64, recipe=None):
   if platform == 'android':
-    factory = m_remote_run_chromium_src('android/perf')
-    bb_trigger = True
+    recipe = recipe or 'android/perf'
+    bb_trigger = recipe == 'android/perf'

[martiniss, 2016/11/09 02:08:59]

Needs to not use buildbot trigger for the chromium recipe. This line should fix
the errors I saw.

   else:
-    factory = m_remote_run_chromium_src('chromium')
+    recipe = recipe or '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:
@@ -193,7 +195,7 @@ _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)
+_AddTester('Android Nexus5X Perf', 'android', num_shards=3, recipe='chromium')
 _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)