Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/swarming_client/api.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 recipe_engine import recipe_api
 
 
 class SwarmingClientApi(recipe_api.RecipeApi):
   """Code that both isolate and swarming recipe modules depend on.
 
@@ skipping 20 matching lines @@
     otherwise. Fail-fast behavior is used because if machines silently fell back
     to checking out the entire workspace, that would cause dramatic increases
     in cycle time if a misconfiguration were made and it were no longer possible
     for the bot to check out swarming_client separately.
     """
     # If the following line throws an exception, it either means the
     # bot is misconfigured, or, if you're testing locally, that you
     # need to pass in some recent legal revision for this property.
     if revision is None:
       revision = self.m.properties['parent_got_swarming_client_revision']
-    self._client_path = self.m.infra_paths['slave_build'].join('swarming.client')
+    self._client_path = self.m.path['slave_build'].join('swarming.client')
     self.m.git.checkout(
         url='https://chromium.googlesource.com/external/swarming.client.git',
         ref=revision,
         dir_path=self._client_path,
         step_suffix='swarming_client',
         curl_trace_file=curl_trace_file,
         can_fail_build=can_fail_build)
 
   @property
   def path(self):
@@ skipping 68 matching lines @@
       # TODO(martiniss) remove once recipe 1.5 migration done
       step_result = self.m.python.inline(
           '%s is too old' % script,
           'import sys; sys.exit(1)',
           add_python_log=False)
       # TODO(martiniss) get rid of this bare string.
       step_result.presentation.status = self.m.step.FAILURE
       step_result.presentation.step_text = abort_reason
 
       raise self.m.step.StepFailure(abort_reason)