Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/skia_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 = 4*60*60
 DEFAULT_TASK_TIMEOUT = 60*60
 DEFAULT_IO_TIMEOUT = 20*60
 
 
 class SkiaSwarmingApi(recipe_api.RecipeApi):
   """Provides steps to run Skia tasks on swarming bots."""
 
   @property
   def swarming_temp_dir(self):
     """Path where artifacts like isolate file and json output will be stored."""
-    return self.m.infra_paths['slave_build'].join('swarming_temp_dir')
+    return self.m.path['slave_build'].join('swarming_temp_dir')
 
   @property
   def tasks_output_dir(self):
     """Directory where the outputs of the swarming tasks will be stored."""
     return self.swarming_temp_dir.join('outputs')
 
   def isolated_file_path(self, task_name):
     """Get the path to the given task's .isolated file."""
     return self.swarming_temp_dir.join('skia-task-%s.isolated' % task_name)
 
@@ skipping 12 matching lines @@
                  '-d', luci_go_dir.join('linux64')])
     self.m.step('download luci-go mac',
                 ['download_from_google_storage', '--no_resume',
                  '--platform=darwin', '--no_auth', '--bucket', 'chromium-luci',
                  '-d', luci_go_dir.join('mac64')])
     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')])
     # Copy binaries to the expected location.
-    dest = self.m.infra_paths['slave_build'].join('luci-go')
+    dest = self.m.path['slave_build'].join('luci-go')
     self.m.file.rmtree('Go binary dir', 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):
@@ skipping 164 matching lines @@
   def collect_swarming_task_isolate_hash(self, swarming_task):
     """Wait for the given swarming task to finish and return its output hash.
 
     Args:
       swarming_task: An instance of swarming.SwarmingTask.
     Returns:
       the hash of the isolate output of the task.
     """
     res = self.collect_swarming_task(swarming_task)
     return res.json.output['shards'][0]['isolated_out']['isolated']