Refactor chromium_tests tryserver.chromium.perf builder spec.

scripts/slave/recipe_modules/chromium_tests/chromium_perf.py

 # Copyright 2015 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.
 
 import collections
 
 from . import steps
 
 
 _builders = collections.defaultdict(dict)
@@ skipping 19 matching lines @@
     },
     'disable_tests': disable_tests,
     'gclient_config': gclient_config,
     'testing': {
       'platform': 'linux' if platform == 'android' else platform,
     },
     'tests': tests,
   }
 
 
-def _BuildSpec(platform, target_bits):
-  if target_bits == 64:
-    perf_id = platform
-  else:
-    perf_id = '%s-%d' % (platform, target_bits)
-
+def BuildSpec(perf_id, platform, target_bits):
   if platform == 'android':
     tests = []
   else:
     tests = [steps.SizesStep('https://chromeperf.appspot.com', perf_id)]
 
   spec = _BaseSpec(
       bot_type='builder',
       chromium_apply_config=['mb', 'chromium_perf', 'goma_hermetic_fallback'],
       disable_tests=True,
       gclient_config='chromium',
@@ skipping 36 matching lines @@
     spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android'
     spec['gclient_apply_config'] = ['android']
   else:
     spec['test_generators'] = [steps.generate_script]
     spec['test_spec_file'] = 'chromium.perf.json'
 
   return spec
 
 
 def _AddBuildSpec(name, platform, target_bits=64):
-  SPEC['builders'][name] = _BuildSpec(platform, target_bits)
+  if target_bits == 64:
+    perf_id = platform
+  else:
+    perf_id = '%s-%d' % (platform, target_bits)
+
+  SPEC['builders'][name] = BuildSpec(perf_id, platform, target_bits)
   assert target_bits not in _builders[platform]
   _builders[platform][target_bits] = name
 
 
 def _AddTestSpec(name, perf_id, platform, target_bits=64,
                  max_battery_temp=350, num_host_shards=1, num_device_shards=1,
                  known_devices_file='.known_devices'):
   parent_builder = _builders[platform][target_bits]
   for shard_index in xrange(num_host_shards):
     builder_name = '%s (%d)' % (name, shard_index + 1)
@@ skipping 51 matching lines @@
 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac',
              num_host_shards=5)
 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac',
              num_host_shards=5)
 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac',
              num_host_shards=5)
 
 
 _AddTestSpec('Linux Perf', 'linux-release', 'linux',
              num_host_shards=5)