Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.py

 # Copyright 2016 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 = [
     'chromium',
     'depot_tools/bot_update',
     'depot_tools/gclient',
-    'depot_tools/infra_paths',
     'recipe_engine/json',
     'recipe_engine/path',
     'recipe_engine/properties',
     'recipe_engine/python',
     'recipe_engine/step',
 ]
 
 
 def ChromiumOS_Linux_Tests_steps(api):
     build_properties = api.properties.legacy()
@@ skipping 20 matching lines @@
     result = api.bot_update.ensure_checkout(force=True)
     build_properties.update(result.json.output.get("properties", {}))
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=shared_library'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--target', 'Debug']
     if "clobber" in api.properties:
         args.append("--clobber")
     api.python("compile",
-               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+               api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # runtest step
     api.python(
         "sync_integration_tests",
-        api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+        api.path["build"].join("scripts", "slave", "runtest.py"),
         args=
         ['--target', 'Debug', "--build-properties=%s" %
          api.json.dumps(build_properties,
                         separators=(',', ':')),
          ('--factory-properties={"blink_config":"chromium","gclient_env":'
           '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'
           '"GYP_DEFINES":" component=shared_library","LANDMINES_VERBOSE":"1"},'
           '"generate_gtest_json":true,"test_results_server":'
           '"test-results.appspot.com"}'), '--annotate=gtest', '--test-type',
          'sync_integration_tests', '--generate-json-file', '-o',
@@ skipping 77 matching lines @@
     build_properties.update(result.json.output.get("properties", {}))
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'GYP_GENERATORS': 'ninja',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'asan=1 lsan=1 component=static_library',
            'LANDMINES_VERBOSE': '1'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # update_clang step; generic ShellCommand converted
     api.step("update_clang",
              ['python', 'src/tools/clang/scripts/update.py'],
              env={'LLVM_URL': 'http://llvm.org/svn/llvm-project'},
-             cwd=api.infra_paths['slave_build'])
+             cwd=api.path["slave_build"])
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--target', 'Release', '--build-tool=ninja',
             '--compiler=goma-clang', '--', 'blink_tests']
     if "clobber" in api.properties:
         args.append("--clobber")
     api.python("compile",
-               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+               api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # runtest step
     api.python(
         "webkit_tests",
-        api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+        api.path["build"].join("scripts", "slave", "runtest.py"),
         args=
         ['--run-python-script', '--target', 'Release', "--build-properties=%s"
          % api.json.dumps(build_properties,
                           separators=(',', ':')),
          ('--factory-properties={"additional_expectations":'
           '[["third_party","WebKit","LayoutTests","ASANExpectations"]],'
           '"archive_webkit_results":false,"asan":true,"blink_config":"blink",'
           '"gclient_env":{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE"'
           ':"0","GYP_DEFINES":"asan=1 lsan=1 component=static_library",'
           '"GYP_GENERATORS":"ninja","LANDMINES_VERBOSE":"1"},'
           '"generate_gtest_json":true,"lsan":true,"time_out_ms":"48000",'
           '"webkit_dir":"third_party/WebKit/Source","webkit_test_options":'
-          '["--enable-sanitizer"]}'), '--no-xvfb', api.infra_paths['build'].join(
+          '["--enable-sanitizer"]}'), '--no-xvfb', api.path["build"].join(
               "scripts", "slave", "chromium", "layout_test_wrapper.py"),
          '--target', 'Release', '-o', '../../layout-test-results',
          '--build-number', api.properties["buildnumber"], '--builder-name',
          api.properties["buildername"], '--additional-expectations',
          'src/third_party/WebKit/LayoutTests/ASANExpectations',
          '--time-out-ms', '48000', '--options=--enable-sanitizer'])
 
 
 def Android_Asan_Builder_Tests__dbg__steps(api):
     build_properties = api.properties.legacy()
@@ skipping 63 matching lines @@
     build_properties.update(result.json.output.get("properties", {}))
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=static_library',
            'LLVM_DOWNLOAD_GOLD_PLUGIN': '1'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--target', 'Release', '--clobber', 'chromium_builder_asan']
     api.python("compile",
-               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+               api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # ClusterFuzz Archive step
     # HACK(aneeshm): chromium_utils fails without this.
     build_properties["primary_repo"] = ""
     api.python(
         'ClusterFuzz Archive',
-        api.infra_paths['build'].join("scripts", "slave", "chromium",
+        api.path["build"].join("scripts", "slave", "chromium",
                                "cf_archive_build.py"),
         args=
         ['--target', 'Release', "--build-properties=%s" %
          api.json.dumps(build_properties,
                         separators=(',', ':')),
          ('--factory-properties={"blink_config":"chromium","cf_archive_build":'
           'true,"cf_archive_name":"cfi","gclient_env":'
           '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'
           '"GYP_DEFINES":" component=static_library","LANDMINES_VERBOSE":"1",'
           '"LLVM_DOWNLOAD_GOLD_PLUGIN":"1"},"gs_acl":"public-read",'
           '"gs_bucket":"gs://chromium-browser-cfi"}')],
-        cwd=api.infra_paths['slave_build'])
+        cwd=api.path["slave_build"])
 
 
 dispatch_directory = {
     'ChromiumOS Linux Tests': ChromiumOS_Linux_Tests_steps,
     'Android ChromeDriver Tests (dbg)': Android_ChromeDriver_Tests__dbg__steps,
     'Blink Linux LSan ASan': Blink_Linux_LSan_ASan_steps,
     'Android Asan Builder Tests (dbg)': Android_Asan_Builder_Tests__dbg__steps,
     'CFI Linux CF': CFI_Linux_CF_steps,
 }
 
@@ skipping 62 matching lines @@
     api.properties(revision='123456789abcdef') +
     api.properties(got_revision='123456789abcdef') +
     api.properties(buildnumber='42') +
     api.properties(slavename='TestSlave')
         )
   yield (api.test('builder_not_in_dispatch_directory') +
     api.properties(mastername='chromium.fyi') +
     api.properties(buildername='nonexistent_builder') +
     api.properties(slavename='TestSlave')
         )