Revert "build: roll infra_paths changes"

scripts/slave/recipes/run_presubmit.py

 # Copyright (c) 2013 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.
 
 DEPS = [
   'depot_tools/bot_update',
   'depot_tools/gclient',
   'depot_tools/git',
-  'depot_tools/infra_paths',
   'depot_tools/presubmit',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'depot_tools/tryserver',
   'depot_tools/rietveld',
   'v8',
   'webrtc',
 ]
@@ skipping 14 matching lines @@
   got_revision_property = api.gclient.c.got_revision_mapping[relative_root]
   upstream = bot_update_step.json.output['properties'].get(
       got_revision_property)
   if (not upstream or
       isinstance(upstream, int) or
       (upstream.isdigit() and len(upstream) < 40)):
     # If got_revision is an svn revision, then use got_revision_git.
     upstream = bot_update_step.json.output['properties'].get(
         '%s_git' % got_revision_property) or ''
 
-  abs_root = api.infra_paths['slave_build'].join(relative_root)
+  abs_root = api.path['slave_build'].join(relative_root)
   # TODO(hinoka): Extract email/name from issue?
   api.git('-c', 'user.email=commit-bot@chromium.org',
           '-c', 'user.name=The Commit Bot',
           'commit', '-a', '-m', 'Committed patch',
           name='commit git patch', cwd=abs_root)
 
   if api.properties.get('runhooks'):
     api.gclient.runhooks()
 
   patch_storage = api.properties.get('patch_storage', 'rietveld')
   if patch_storage == 'rietveld':
     presubmit_args = [
       '--issue', api.properties['issue'],
       '--patchset', api.properties['patchset'],
       '--rietveld_url', api.properties['rietveld'],
       '--rietveld_fetch',
     ]
     if codereview_auth:
       presubmit_args.extend([
           '--rietveld_email_file',
-          api.infra_paths['build'].join('site_config', '.rietveld_client_email')])
+          api.path['build'].join('site_config', '.rietveld_client_email')])
       presubmit_args.extend([
           '--rietveld_private_key_file',
-          api.infra_paths['build'].join('site_config', '.rietveld_secret_key')])
+          api.path['build'].join('site_config', '.rietveld_secret_key')])
     else:
       presubmit_args.extend(['--rietveld_email', ''])  # activate anonymous mode
   elif patch_storage == 'gerrit':
     # Field event.patchSet.ref looks like 'refs/changes/11/338811/4'
     issue, patchset = api.properties['event.patchSet.ref'].split('/')[-2:]
     presubmit_args = [
       '--issue', issue,
       '--patchset', patchset,
       '--gerrit_url', api.properties['gerrit'],
       '--gerrit_fetch',
@@ skipping 96 matching lines @@
     api.test('recipes-py') +
     api.properties.tryserver(
         mastername='tryserver.infra',
         buildername='infra_presubmit',
         repo_name='recipes_py',
         patch_project='recipes-py',
         runhooks=True) +
     api.step_data('presubmit', api.json.output([['infra_presubmit',
                                                  ['compile']]]))
   )