Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium_drfuzz.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.types import freeze
 
 
 DEPS = [
   'archive',
   'depot_tools/bot_update',
-  'depot_tools/infra_paths',
   'chromium',
   'file',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
   'recipe_engine/step',
 ]
@@ skipping 23 matching lines @@
     },
   },
 })
 
 
 def gn_refs(api, step_name, args):
   """Runs gn refs with given additional arguments.
   Returns: the list of matched targets.
   """
   step_result = api.python(step_name,
-          api.infra_paths['depot_tools'].join('gn.py'),
+          api.path['depot_tools'].join('gn.py'),
           ['--root=%s' % str(api.path['checkout']),
            'refs',
            str(api.chromium.output_dir),
           ] + args,
           stdout=api.raw_io.output())
   return step_result.stdout.split()
 
 
 def RunSteps(api):
   mastername = api.m.properties['mastername']
@@ skipping 20 matching lines @@
            '--type=executable',
            '--as=output',
            '//testing/libfuzzer:no_clusterfuzz'])
   targets = list(set(all_fuzzers).difference(set(no_clusterfuzz)))
   api.step.active_result.presentation.logs['all_fuzzers'] = all_fuzzers
   api.step.active_result.presentation.logs['no_clusterfuzz'] = no_clusterfuzz
   api.step.active_result.presentation.logs['targets'] = targets
   api.chromium.compile(targets=targets)
 
   api.archive.clusterfuzz_archive(
-          build_dir=api.infra_paths['slave_build'].join(
-              'src', 'out', 'Release'),
+          build_dir=api.path['slave_build'].join('src', 'out', 'Release'),
           update_properties=checkout_results.json.output['properties'],
           gs_bucket=bot_config['upload_bucket'],
           archive_prefix='drfuzz',
           archive_subdir_suffix=bot_config['upload_directory'],
           gs_acl='public-read')
 
 def GenTests(api):
   for test in api.chromium.gen_tests_for_builders(BUILDERS):
     yield (test +
            api.step_data('calculate all_fuzzers',
                stdout=api.raw_io.output('target1 target2 target3')) +
            api.step_data('calculate no_clusterfuzz',
                stdout=api.raw_io.output('target1'))
            )