Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/cipd/api.py

 # Copyright 2015 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 CIPDApi(recipe_api.RecipeApi):
   """CIPDApi provides support for CIPD."""
   def __init__(self, *args, **kwargs):
@@ skipping 24 matching lines @@
     """Ensures the client is installed.
 
     If you specify version as a hash, make sure its correct platform.
     """
     # TODO(seanmccullough): clean up older CIPD installations.
     step = self.m.python(
         name=step_name,
         script=self.resource('bootstrap.py'),
         args=[
           '--platform', self.platform_suffix(),
-          '--dest-directory', self.m.infra_paths['slave_build'].join('cipd'),
+          '--dest-directory', self.m.path['slave_build'].join('cipd'),
           '--json-output', self.m.json.output(),
         ] +
         (['--version', version] if version else []),
         step_test_data=lambda: self.test_api.example_install_client(version)
     )
     self._cipd_executable = step.json.output['executable']
     self._cipd_instance_id = step.json.output['instance_id']
 
     step.presentation.step_text = (
         'cipd instance_id: %s' % self._cipd_instance_id)
@@ skipping 50 matching lines @@
       * version could be either instance_id, or ref, or unique tag.
 
     If installing a package requires credentials, call
     ``set_service_account_credentials`` before calling this function.
     """
     assert self._cipd_executable
 
     package_list = ['%s %s' % (name, version)
                     for name, version in sorted(packages.items())]
     list_data = self.m.raw_io.input('\n'.join(package_list))
-    bin_path = self.m.infra_paths['slave_build'].join('cipd')
+    bin_path = self.m.path['slave_build'].join('cipd')
     cmd = [
       self._cipd_executable,
       'ensure',
       '--root', root,
       '--list', list_data,
       '--json-output', self.m.json.output(),
     ]
     if self._cipd_credentials:
       cmd.extend(['--service-account-json', self._cipd_credentials])
     return self.m.step(
@@ skipping 79 matching lines @@
 
     return self.m.step(
       'cipd describe %s' % package_name,
       cmd,
       step_test_data=lambda: self.test_api.example_describe(
           package_name, version,
           test_data_refs=test_data_refs,
           test_data_tags=test_data_tags
       )
     )