Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium.fyi.debug_win_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',
     'trigger',
 ]
 
 
 def Vista_Tests__dbg__1__steps(api):
     build_properties = api.properties.legacy()
     # svnkill step; not necessary in recipes
     # update scripts step; implicitly run by recipe engine.
     # taskkill step
-    api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
+    api.python("taskkill", api.path["build"].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
     soln = src_cfg.solutions.add()
     soln.name = "src"
     soln.url = "https://chromium.googlesource.com/chromium/src.git"
     soln.custom_deps = {'src/third_party/WebKit/LayoutTests': None}
     soln.custom_vars = {'webkit_trunk': 'http://src.chromium.org/blink/trunk',
                         'googlecode_url': 'http://%s.googlecode.com/svn',
                         'nacl_trunk':
@@ skipping 11 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_CHROMIUM_NO_ACTION': '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()
     # extract build step
     api.python(
         "extract build",
-        api.infra_paths['build'].join("scripts", "slave", "extract_build.py"),
+        api.path["build"].join("scripts", "slave", "extract_build.py"),
         args=["--target", "Debug", "--build-archive-url", build_properties[
             "parent_build_archive_url"], '--build-properties=%s' %
               api.json.dumps(build_properties,
                              separators=(',', ':'))])
     # runtest step
     api.python(
         "base_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'base_unittests',
          'base_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "cacheinvalidation_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'cacheinvalidation_unittests',
          'cacheinvalidation_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "chrome_elf_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'chrome_elf_unittests',
          'chrome_elf_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "components_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'components_unittests',
          'components_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "courgette_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'courgette_unittests',
          'courgette_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "crypto_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'crypto_unittests',
          'crypto_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "extensions_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'extensions_unittests',
          'extensions_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "gcm_unit_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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'gcm_unit_tests',
          'gcm_unit_tests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "google_apis_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'google_apis_unittests',
          'google_apis_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "gpu_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'gpu_unittests',
          'gpu_unittests.exe', '--gmock_verbose=error', '--gtest_print_time'])
     # runtest step
     api.python(
         "url_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'url_unittests',
          'url_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "jingle_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'jingle_unittests',
          'jingle_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "device_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'device_unittests',
          'device_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "media_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'media_unittests',
          'media_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "net_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'net_unittests',
          'net_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "ppapi_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'ppapi_unittests',
          'ppapi_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "printing_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'printing_unittests',
          'printing_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "remoting_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'remoting_unittests',
          'remoting_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "sbox_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'sbox_unittests',
          'sbox_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "sbox_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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'sbox_integration_tests',
          'sbox_integration_tests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "sbox_validation_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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'sbox_validation_tests',
          'sbox_validation_tests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "ipc_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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'ipc_tests', 'ipc_tests.exe',
          '--gtest_print_time'])
     # runtest step
     api.python(
         "sync_unit_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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'sync_unit_tests',
          'sync_unit_tests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "unit_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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'unit_tests', 'unit_tests.exe',
          '--gtest_print_time'])
     # runtest step
     api.python(
         "skia_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'skia_unittests',
          'skia_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "sql_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'sql_unittests',
          'sql_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "ui_base_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'ui_base_unittests',
          'ui_base_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "content_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'content_unittests',
          'content_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "views_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'views_unittests',
          'views_unittests.exe', '--gtest_print_time'])
     # runtest step
     api.python(
         "installer_util_unittests",
-        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_CHROMIUM_NO_ACTION":'+\
              '"1","GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'installer_util_unittests',
          'installer_util_unittests.exe', '--gtest_print_time'])
     # process dumps step
     api.python("process dumps",
-               api.infra_paths['build'].join("scripts", "slave", "process_dumps.py"),
+               api.path["build"].join("scripts", "slave", "process_dumps.py"),
                args=["--target", "Debug"])
 
 
 def Chromium_Builder__dbg__steps(api):
     build_properties = api.properties.legacy()
     # svnkill step; not necessary in recipes
     # update scripts step; implicitly run by recipe engine.
     # taskkill step
-    api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
+    api.python("taskkill", api.path["build"].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
     soln = src_cfg.solutions.add()
     soln.name = "src"
     soln.url = "https://chromium.googlesource.com/chromium/src.git"
     soln.custom_deps = {'src/third_party/WebKit/LayoutTests': None}
     soln.custom_vars = {'webkit_trunk': 'http://src.chromium.org/blink/trunk',
                         'googlecode_url': 'http://%s.googlecode.com/svn',
                         'nacl_trunk':
@@ skipping 11 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': 'fastbuild=1 component=shared_library',
            'GYP_MSVS_VERSION': '2015'}
     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 = ['--solution', 'all.sln', '--project', 'chromium_builder_tests',
             '--target', 'Debug', '--compiler=goma']
     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)
     # zip_build step
     step_result = api.python(
         "zip build",
-        api.infra_paths['build'].join("scripts", "slave", "zip_build.py"),
+        api.path["build"].join("scripts", "slave", "zip_build.py"),
         args=
         ["--json-urls", api.json.output(), "--target", "Debug", '--build-url',
          'gs://chromium-build-transfer/Chromium FYI Builder (dbg)',
          '--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":'+\
              '"fastbuild=1 component=shared_library",'+\
              '"GYP_MSVS_VERSION":"2015","LANDMINES_VERBOSE":"1"},'+\
@@ skipping 81 matching lines @@
           "root": build_properties.get("root", ""), }},
     ]
     api.trigger(*trigger_spec)
 
 
 def Vista_Tests__dbg__2__steps(api):
     build_properties = api.properties.legacy()
     # svnkill step; not necessary in recipes
     # update scripts step; implicitly run by recipe engine.
     # taskkill step
-    api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
+    api.python("taskkill", api.path["build"].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
     soln = src_cfg.solutions.add()
     soln.name = "src"
     soln.url = "https://chromium.googlesource.com/chromium/src.git"
     soln.custom_deps = {'src/third_party/WebKit/LayoutTests': None}
     soln.custom_vars = {'webkit_trunk': 'http://src.chromium.org/blink/trunk',
                         'googlecode_url': 'http://%s.googlecode.com/svn',
                         'nacl_trunk':
@@ skipping 11 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_CHROMIUM_NO_ACTION': '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()
     # extract build step
     api.python(
         "extract build",
-        api.infra_paths['build'].join("scripts", "slave", "extract_build.py"),
+        api.path["build"].join("scripts", "slave", "extract_build.py"),
         args=["--target", "Debug", "--build-archive-url", build_properties[
             "parent_build_archive_url"], '--build-properties=%s' %
               api.json.dumps(build_properties,
                              separators=(',', ':'))])
     # runtest step
     api.python(
         "browser_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_CHROMIUM_NO_ACTION":"1",'+\
              '"GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'browser_tests',
          'browser_tests.exe', '--lib=browser_tests', '--gtest_print_time'])
     # runtest step
     api.python(
         "content_browsertests",
-        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_CHROMIUM_NO_ACTION":"1",'+\
              '"GYP_DEFINES":" component=shared_library",'+\
              '"LANDMINES_VERBOSE":"1"},"process_dumps":true}',
          '--annotate=gtest', '--test-type', 'content_browsertests',
          'content_browsertests.exe', '--gtest_print_time'])
     # process dumps step
     api.python("process dumps",
-               api.infra_paths['build'].join("scripts", "slave", "process_dumps.py"),
+               api.path["build"].join("scripts", "slave", "process_dumps.py"),
                args=["--target", "Debug"])
 
 
 dispatch_directory = {
     'Vista Tests (dbg)(1)': Vista_Tests__dbg__1__steps,
     'Chromium Builder (dbg)': Chromium_Builder__dbg__steps,
     'Vista Tests (dbg)(2)': Vista_Tests__dbg__2__steps,
 }
 
 
@@ skipping 42 matching lines @@
     api.properties(got_revision='123456789abcdef') +
     api.properties(buildnumber='42') +
     api.properties(parent_build_archive_url='abc') +
     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')
         )