Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium_codesearch.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.types import freeze
 
 DEPS = [
   'depot_tools/bot_update',
-  'depot_tools/infra_paths',
   'chromium',
   'commit_position',
   'file',
   'depot_tools/gclient',
   'gsutil',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
@@ skipping 140 matching lines @@
   # Copy the created output to the correct directory. When running the clang
   # tool, it is assumed by the scripts that the compilation database is in the
   # out/Debug directory, and named 'compile_commands.json'.
   api.step('copy compilation database',
            ['cp', api.raw_io.input(data=result.stdout),
             debug_path.join('compile_commands.json')])
 
   if platform == 'chromeos':
     result = GenerateCompilationDatabase(api, debug_path, targets, 'linux')
     api.python('Filter out duplicate compilation units',
-               api.infra_paths['build'].join('scripts', 'slave', 'chromium',
+               api.path['build'].join('scripts', 'slave', 'chromium',
                                       'filter_compilations.py'),
                ['--compdb-input', debug_path.join('compile_commands.json'),
                 '--compdb-filter', api.raw_io.input(data=result.stdout),
                 '--compdb-output', debug_path.join('compile_commands.json')])
   # Compile the clang tool
   script_path = api.path.sep.join(['tools', 'clang', 'scripts', 'update.py'])
   api.step('compile translation_unit clang tool',
            [script_path, '--force-local-build', '--without-android',
             '--tools', 'translation_unit'],
            cwd=api.path['checkout'])
@@ skipping 16 matching lines @@
     api.step.active_result.presentation.step_text = f.reason_message()
     api.step.active_result.presentation.status = api.step.WARNING
 
   # Create the index pack
   got_revision_cp = api.chromium.build_properties.get('got_revision_cp')
   commit_position = api.commit_position.parse_revision(got_revision_cp)
   index_pack_name = 'index_pack_%s.zip' % platform
   index_pack_name_with_revision = 'index_pack_%s_%s.zip' % (
       platform, commit_position)
   api.python('create index pack',
-             api.infra_paths['build'].join('scripts', 'slave', 'chromium',
+             api.path['build'].join('scripts', 'slave', 'chromium',
                                     'package_index.py'),
              ['--path-to-compdb', debug_path.join('compile_commands.json'),
               '--path-to-archive-output', debug_path.join(index_pack_name)])
 
   # Upload the index pack
   api.gsutil.upload(
       name='upload index pack',
       source=debug_path.join(index_pack_name),
       bucket=BUCKET_NAME,
       dest='%s/%s' % (environment, index_pack_name_with_revision)
   )
 
   # Package the source code.
   tarball_name = 'chromium_src_%s.tar.bz2' % platform
   tarball_name_with_revision = 'chromium_src_%s_%s.tar.bz2' % (
       platform,commit_position)
   api.python('archive source',
-             api.infra_paths['build'].join('scripts','slave',
+             api.path['build'].join('scripts','slave',
                                     'archive_source_codesearch.py'),
              ['src', 'build', 'infra', 'tools', '-f',
               tarball_name])
 
   # Upload the source code.
   api.gsutil.upload(
       name='upload source tarball',
-      source=api.infra_paths['slave_build'].join(tarball_name),
+      source=api.path['slave_build'].join(tarball_name),
       bucket=BUCKET_NAME,
       dest='%s/%s' % (environment, tarball_name_with_revision)
   )
 
 def _sanitize_nonalpha(text):
   return ''.join(c if c.isalnum() else '_' for c in text)
 
 
 def GenTests(api):
   for buildername, config in SPEC['builders'].iteritems():
@@ skipping 13 matching lines @@
     api.test(
         'full_%s_fail' % _sanitize_nonalpha('ChromiumOS Codesearch')) +
     api.step_data('generate compilation database for chromeos',
                   stdout=api.raw_io.output('some compilation data')) +
     api.step_data('generate compilation database for linux',
                   stdout=api.raw_io.output('some compilation data')) +
     api.step_data('run translation_unit clang tool', retcode=2) +
     api.properties.generic(buildername='ChromiumOS Codesearch',
                            mastername='chromium.infra.cron')
   )