Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/chromium.fyi.win_block.recipe_autogen.py
diff --git a/scripts/slave/recipes/chromium.fyi.win_block.recipe_autogen.py b/scripts/slave/recipes/chromium.fyi.win_block.recipe_autogen.py
index 626f69136a464ab686525aec7fc2f7025c8c9366..5c1bdfe581990d1c7a21e45433d9ea5d879d4378 100644
--- a/scripts/slave/recipes/chromium.fyi.win_block.recipe_autogen.py
+++ b/scripts/slave/recipes/chromium.fyi.win_block.recipe_autogen.py
@@ -6,7 +6,6 @@ DEPS = [
     'chromium',
     'depot_tools/bot_update',
     'depot_tools/gclient',
-    'depot_tools/infra_paths',
     'recipe_engine/json',
     'recipe_engine/path',
     'recipe_engine/properties',
@@ -21,7 +20,7 @@ def Win8_Tests__2__steps(api):
     # 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)
@@ -53,7 +52,7 @@ def Win8_Tests__2__steps(api):
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=static_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
@@ -61,7 +60,7 @@ def Win8_Tests__2__steps(api):
     # 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", "Release", "--build-archive-url", build_properties[
             "parent_build_archive_url"], '--build-properties=%s' %
               api.json.dumps(build_properties,
@@ -70,7 +69,7 @@ def Win8_Tests__2__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -85,7 +84,7 @@ def Win8_Tests__2__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -99,7 +98,7 @@ def Win8_Tests__2__steps(api):
            '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", "Release"])
 
 
@@ -108,7 +107,7 @@ def Chromium_Builder_steps(api):
     # 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)
@@ -140,7 +139,7 @@ def Chromium_Builder_steps(api):
            'GYP_DEFINES': 'fastbuild=1 component=static_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
@@ -151,12 +150,12 @@ def Chromium_Builder_steps(api):
     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", "Release", '--build-url',
@@ -295,7 +294,7 @@ def Chromium_Win_MiniInstaller_Tests_steps(api):
     # 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)
@@ -327,7 +326,7 @@ def Chromium_Win_MiniInstaller_Tests_steps(api):
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=static_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
@@ -335,7 +334,7 @@ def Chromium_Win_MiniInstaller_Tests_steps(api):
     # 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", "Release", "--build-archive-url", build_properties[
             "parent_build_archive_url"], '--build-properties=%s' %
               api.json.dumps(build_properties,
@@ -343,12 +342,12 @@ def Chromium_Win_MiniInstaller_Tests_steps(api):
     with api.step.defer_results():
       # test mini installer wrapper step
       api.python("test installer",
-                 api.infra_paths['build'].join("scripts", "slave", "chromium",
+                 api.path["build"].join("scripts", "slave", "chromium",
                                         "test_mini_installer_wrapper.py"),
                  args=["--target", "Release"])
       # 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", "Release"])
 
 
@@ -357,7 +356,7 @@ def Win8_Tests__1__steps(api):
     # 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)
@@ -389,7 +388,7 @@ def Win8_Tests__1__steps(api):
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=static_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
@@ -397,7 +396,7 @@ def Win8_Tests__1__steps(api):
     # 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", "Release", "--build-archive-url", build_properties[
             "parent_build_archive_url"], '--build-properties=%s' %
               api.json.dumps(build_properties,
@@ -406,7 +405,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -421,7 +420,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -436,7 +435,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -451,7 +450,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -466,7 +465,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -481,7 +480,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -496,7 +495,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -511,7 +510,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -526,7 +525,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -541,7 +540,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -556,7 +555,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -571,7 +570,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -586,7 +585,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -601,7 +600,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -616,7 +615,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -631,7 +630,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -646,7 +645,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -661,7 +660,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -676,7 +675,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -691,7 +690,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -706,7 +705,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -721,7 +720,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -736,7 +735,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -751,7 +750,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -766,7 +765,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -781,7 +780,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -796,7 +795,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -811,7 +810,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -826,7 +825,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -841,7 +840,7 @@ def Win8_Tests__1__steps(api):
       # 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', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -855,7 +854,7 @@ def Win8_Tests__1__steps(api):
            '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", "Release"])