Re-organize Skia recipes

infra/bots/recipes/swarm_perf.py

 # Copyright 2016 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.
 
 
 # Recipe module for Skia Swarming perf.
 
 
 DEPS = [
+  'core',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/raw_io',
-  'skia',
+  'run',
 ]
 
 
 TEST_BUILDERS = {
   'client.skia': {
     'skiabot-linux-swarm-000': [
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release',
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug',
       'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
       'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
       'Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
       'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench',
     ],
   },
 }
 
 
 def RunSteps(api):
-  api.skia.setup()
-  api.skia.perf_steps()
-  api.skia.cleanup_steps()
-  api.skia.check_failure()
+  api.core.setup()
+  api.core.perf_steps()
+  api.core.cleanup_steps()
+  api.run.check_failure()
 
 
 def GenTests(api):
   def AndroidTestData(builder):
     test_data = (
         api.step_data(
             'get EXTERNAL_STORAGE dir',
             stdout=api.raw_io.output('/storage/emulated/legacy')) +
         api.step_data(
             'adb root',
@@ skipping 63 matching lines @@
     api.path.exists(
         api.path['slave_build'].join('skia'),
         api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                      'skimage', 'VERSION'),
         api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                      'skp', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     api.platform('win', 64)
   )