The second solution solution for ToT catapult.

scripts/slave/recipe_modules/chromium_tests/chromium_perf.py

Index: scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py b/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
index c9682d027e556d1bc503ac2d9a6afd230f76ee3a..af71431a79166f1bd78e588b3ccda9dbecbd6593 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
@@ -18,17 +18,17 @@ SPEC = {
 }
 
 
-def _BaseSpec(bot_type, chromium_config, disable_tests,
+def _BaseSpec(bot_type, config_name, disable_tests,
               platform, target_bits, tests):
   spec = {
     'bot_type': bot_type,
-    'chromium_config': chromium_config,
+    'chromium_config': config_name,
     'chromium_config_kwargs': {
       'BUILD_CONFIG': 'Release',
       'TARGET_BITS': target_bits,
     },
     'disable_tests': disable_tests,
-    'gclient_config': 'chromium_perf',
+    'gclient_config': config_name,
     'testing': {
       'platform': 'linux' if platform == 'android' else platform,
     },
@@ -45,7 +45,7 @@ def _BaseSpec(bot_type, chromium_config, disable_tests,
   return spec
 
 
-def BuildSpec(chromium_config, perf_id, platform, target_bits):
+def BuildSpec(config_name, perf_id, platform, target_bits):
   if platform == 'android':
     # TODO: Run sizes on Android.
     tests = []
@@ -54,23 +54,24 @@ def BuildSpec(chromium_config, perf_id, platform, target_bits):
 
   spec = _BaseSpec(
       bot_type='builder',
-      chromium_config=chromium_config,
+      config_name=config_name,
       disable_tests=True,
       platform=platform,
       target_bits=target_bits,
-      tests=tests)
+      tests=tests,
+  )
 
   spec['compile_targets'] = ['chromium_builder_perf']
 
   return spec
 
 
-def _TestSpec(chromium_config, parent_builder, perf_id, platform, target_bits,
+def _TestSpec(config_name, parent_builder, perf_id, platform, target_bits,
               max_battery_temp, shard_index, num_host_shards,
               num_device_shards):
   spec = _BaseSpec(
       bot_type='tester',
-      chromium_config=chromium_config,
+      config_name=config_name,
       disable_tests=platform == 'android',
       platform=platform,
       target_bits=target_bits,