Re-organize Skia recipes

infra/bots/recipe_modules/swarming/api.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.
 
 
 from recipe_engine import recipe_api
 import shlex
 
 
 DEFAULT_TASK_EXPIRATION = 20*60*60
@@ skipping 43 matching lines @@
                  '--platform=darwin', '--no_auth', '--bucket', 'chromium-luci',
                  '-d', luci_go_dir.join('mac64')],
                 env=env)
     self.m.step('download luci-go win',
                 ['download_from_google_storage', '--no_resume',
                  '--platform=win32', '--no_auth', '--bucket', 'chromium-luci',
                  '-d', luci_go_dir.join('win64')],
                 env=env)
     # Copy binaries to the expected location.
     dest = self.m.path['slave_build'].join('luci-go')
-    self.m.skia.rmtree(dest)
+    self.m.run.rmtree(dest)
     self.m.file.copytree('Copy Go binary',
                          source=luci_go_dir,
                          dest=dest)
 
   def isolate_and_trigger_task(
       self, isolate_path, isolate_base_dir, task_name, isolate_vars,
       swarm_dimensions, isolate_blacklist=None, extra_isolate_hashes=None,
       idempotent=False, store_output=True, extra_args=None, expiration=None,
       hard_timeout=None, io_timeout=None, cipd_packages=None):
     """Isolate inputs and trigger the task to run."""
@@ skipping 210 matching lines @@
     else:
       for _, task in step_result.json.output.get('tasks', {}).iteritems():
         ids.append(task['task_id'])
     for idx, task_id in enumerate(ids):
       link = MILO_LOG_LINK % task_id
       k = 'view steps on Milo'
       if len(ids) > 1:  # pragma: nocover
         k += ' (shard index %d, %d total)' % (idx, len(ids))
       step_result.presentation.links[k] = link