Revert "build: roll infra_paths changes"

scripts/slave/recipes/v8/auto_roll_release_process.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.
 
 DEPS = [
   'depot_tools/bot_update',
-  'depot_tools/infra_paths',
   'file',
   'depot_tools/gclient',
   'depot_tools/git',
   'gsutil',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
   'recipe_engine/step',
@@ skipping 36 matching lines @@
       'update-ref', ref, hsh,
       cwd=api.path['checkout'],
   )
   api.git(
       'push', repo, '%s:%s' % (ref, ref),
       cwd=api.path['checkout'],
   )
 
   # Upload log for debugging.
   ref_log_file_name = ref.replace('/', '_') + '.log'
-  ref_log_path = api.infra_paths['slave_build'].join(ref_log_file_name)
+  ref_log_path = api.path['slave_build'].join(ref_log_file_name)
   log = []
   if api.path.exists(ref_log_path):
     log.append(api.file.read(
       'Read %s' % ref_log_file_name, ref_log_path, test_data=''))
   log.append('%s %s' % (hsh, str(api.time.time())))
   api.file.write('Write %s' % ref_log_file_name, ref_log_path, '\n'.join(log))
   api.gsutil.upload(
       ref_log_path,
       'chromium-v8-auto-roll',
       api.path.join('v8_release_process', ref_log_file_name),
   )
 
 
 def ReadTimeStamp(api, name):
   return int(float(
       api.file.read(
           name,
-          api.infra_paths['slave_build'].join('timestamp.txt'),
+          api.path['slave_build'].join('timestamp.txt'),
       ).strip()))
 
 
 def WriteTimeStamp(api, name, timestamp):
   api.file.write(
       name,
-      api.infra_paths['slave_build'].join('timestamp.txt'),
+      api.path['slave_build'].join('timestamp.txt'),
       str(timestamp),
   )
 
 
 def LogStep(api, text):
   api.step('log', ['echo', text])
 
 
 def AgeLimitBailout(api, new_date, old_date):
   age = (new_date - old_date) / SEC_TO_HOURS
   LogStep(api, 'Current candidate is %dh old (limit: %dh).' %
                (age, TIME_LIMIT_HOURS))
   return age < TIME_LIMIT_HOURS
 
 
 def GetLKGR(api):
   step_result = api.python(
       'get new lkgr',
-      api.infra_paths['build'].join('scripts', 'tools', 'runit.py'),
-      [api.infra_paths['build'].join('scripts', 'tools', 'pycurl.py'),
+      api.path['build'].join('scripts', 'tools', 'runit.py'),
+      [api.path['build'].join('scripts', 'tools', 'pycurl.py'),
        '%s/lkgr' % STATUS_URL],
       stdout=api.raw_io.output(),
   )
   lkgr = step_result.stdout.strip()
   step_result.presentation.logs['logs'] = [
     'New candidate: %s (%s)' % (lkgr, str(api.time.time())),
   ]
   return lkgr
 
 
 def ClusterfuzzHasIssues(api):
   step_test_data = lambda: api.json.test_api.output([])
   step_result = api.python(
       'check clusterfuzz',
       api.path['checkout'].join(
           'tools', 'release', 'check_clusterfuzz.py'),
-      ['--key-file', api.infra_paths['slave_build'].join('.cf_key'),
+      ['--key-file', api.path['slave_build'].join('.cf_key'),
        '--results-file', api.json.output(add_json_log=False)],
       # Note: Output is suppressed for security reasons.
       stdout=api.raw_io.output('out'),
       stderr=api.raw_io.output('err'),
       step_test_data=step_test_data,
   )
   results = step_result.json.output
   if results:
     step_result.presentation.text = 'Found %s issues.' % len(results)
     for result in results[:SHOW_MAX_ISSUES]:
@@ skipping 84 matching lines @@
         api.override_step_data(
             'git show-ref %s' % ROLL_REF,
             api.raw_io.stream_output(current_roll, stream='stdout'),
         ) +
         api.override_step_data(
             'check timestamp',
             api.raw_io.output(current_date),
         ) +
         api.time.seed(int(float(new_date))) +
         api.time.step(2) +
-        api.infra_paths.exists(api.infra_paths['slave_build'].join(
+        api.path.exists(api.path['slave_build'].join(
             LKGR_REF.replace('/', '_') + '.log'))
     )
 
   yield Test(
       'same_lkgr',
       hsh_old,
       date_old,
       hsh_old,
       date_new,
   )
@@ skipping 27 matching lines @@
       date_new,
       current_roll=hsh_old,
   ) + api.override_step_data('check clusterfuzz', api.json.output([1, 2]))
   yield Test(
       'new_lkgr_failed_timestamp',
       hsh_recent,
       date_recent,
       hsh_new,
       date_new,
   ) + api.override_step_data('check timestamp', retcode=1)