Clean up some discrepancies in the perf recipe configs

scripts/slave/recipe_modules/chromium_tests/chromium_perf_fyi.py

 # Copyright 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.
 
 from . import chromium_perf
 from . import steps
 
 import DEPS
 CHROMIUM_CONFIG_CTX = DEPS['chromium'].CONFIG_CTX
 GCLIENT_CONFIG_CTX = DEPS['gclient'].CONFIG_CTX
@@ skipping 15 matching lines @@
   pass
 
 
 def _AddBuildSpec(name, perf_id, platform, config_name='chromium_perf',
                   target_bits=64):
   SPEC['builders'][name] = chromium_perf.BuildSpec(
       config_name, perf_id, platform, target_bits)
 
 
 def _AddTestSpec(name, perf_id, platform,
-                 parent_builder=None, target_bits=64):
-  parent_buildername = (parent_builder or
-      chromium_perf.builders[platform][target_bits])
-  spec = chromium_perf.TestSpec('chromium_perf', parent_buildername, perf_id,
-                                platform, target_bits, 0, 1, 1)
-  if not parent_builder:
+                 parent_buildername=None, target_bits=64):
+  tests = [steps.DynamicPerfTests(
+      perf_id, platform, target_bits,
+      num_device_shards=1, num_host_shards=1, shard_index=0)]
+
+  spec = chromium_perf.TestSpec(
+      'chromium_perf', platform, target_bits,
+      parent_buildername=parent_buildername, tests=tests)
+  if not parent_buildername:
     spec['parent_mastername'] = 'chromium.perf'
-  spec['disable_tests'] = True
-  SPEC['builders'][name] = spec
-
-
-def _AddIsolatedTestSpec(name, platform, parent_builder=None, target_bits=64):
-  spec = {
-    'bot_type': 'tester',
-    'chromium_config': 'chromium_perf',
-    'chromium_config_kwargs': {
-      'BUILD_CONFIG': 'Release',
-      'TARGET_BITS': target_bits,
-    },
-    'gclient_config': 'chromium_perf',
-    'testing': {
-      'platform': 'linux' if platform == 'android' else platform,
-    },
-    'parent_buildername': parent_builder,
-    'test_generators': [steps.generate_isolated_script],
-    'test_spec_file': 'chromium.perf.fyi.json',
-    'enable_swarming': True,
-    'parent_mastername': 'chromium.perf',
-  }
 
   SPEC['builders'][name] = spec
 
 
+def _AddIsolatedTestSpec(name, platform, target_bits=64):
+  spec = chromium_perf.TestSpec('chromium_perf', platform, target_bits)
+  spec['parent_mastername'] = 'chromium.perf'
+  spec['enable_swarming'] = True
+  spec['test_generators'] = [steps.generate_isolated_script]
+  SPEC['builders'][name] = spec
+
+
 _AddTestSpec('Android Galaxy S5 Perf (1)', 'fyi-android-galaxy-s5', 'android',
              target_bits=32)
 
 
 _AddTestSpec('Win 7 Intel GPU Perf (Xeon)', 'chromium-rel-win7-gpu-intel',
              'win')
 _AddTestSpec('Win Power High-DPI Perf', 'win-power-high-dpi', 'win')
 
 
 _AddTestSpec('Mac Power Dual-GPU Perf', 'mac-power-dual-gpu', 'mac')
 _AddTestSpec('Mac Power Low-End Perf', 'mac-power-low-end', 'mac')
 _AddTestSpec('Mac Test Retina Perf', 'mac-test-retina', 'mac')
 
 
 _AddBuildSpec('Win Clang Builder', 'win-clang-builder', 'win',
               config_name='chromium_perf_clang', target_bits=32)
 _AddTestSpec('Win Clang Perf', 'chromium-win-clang', 'win',
-             parent_builder='Win Clang Builder', target_bits=32)
+             parent_buildername='Win Clang Builder', target_bits=32)
 
 
-_AddIsolatedTestSpec('Win 10 Low-End 2 Core Perf', 'win',
-                     parent_builder='Win x64 Builder')
-_AddIsolatedTestSpec('Win 10 Low-End 4 Core Perf', 'win',
-                     parent_builder='Win x64 Builder')
+_AddIsolatedTestSpec('Win 10 Low-End 2 Core Perf', 'win')
+_AddIsolatedTestSpec('Win 10 Low-End 4 Core Perf', 'win')