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 5c1bdfe581990d1c7a21e45433d9ea5d879d4378..626f69136a464ab686525aec7fc2f7025c8c9366 100644
--- a/scripts/slave/recipes/chromium.fyi.win_block.recipe_autogen.py
+++ b/scripts/slave/recipes/chromium.fyi.win_block.recipe_autogen.py
@@ -6,6 +6,7 @@ DEPS = [
     'chromium',
     'depot_tools/bot_update',
     'depot_tools/gclient',
+    'depot_tools/infra_paths',
     'recipe_engine/json',
     'recipe_engine/path',
     'recipe_engine/properties',
@@ -20,7 +21,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.path["build"].join("scripts", "slave",
+    api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ -52,7 +53,7 @@ def Win8_Tests__2__steps(api):
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=static_library'}
     api.python("gclient runhooks wrapper",
-               api.path["build"].join("scripts", "slave",
+               api.infra_paths['build'].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
@@ -60,7 +61,7 @@ def Win8_Tests__2__steps(api):
     # extract build step
     api.python(
         "extract build",
-        api.path["build"].join("scripts", "slave", "extract_build.py"),
+        api.infra_paths['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,
@@ -69,7 +70,7 @@ def Win8_Tests__2__steps(api):
       # runtest step
       api.python(
           "browser_tests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -84,7 +85,7 @@ def Win8_Tests__2__steps(api):
       # runtest step
       api.python(
           "content_browsertests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -98,7 +99,7 @@ def Win8_Tests__2__steps(api):
            'content_browsertests.exe', '--gtest_print_time'])
       # process dumps step
       api.python("process dumps",
-                 api.path["build"].join("scripts", "slave", "process_dumps.py"),
+                 api.infra_paths['build'].join("scripts", "slave", "process_dumps.py"),
                  args=["--target", "Release"])
 
 
@@ -107,7 +108,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.path["build"].join("scripts", "slave",
+    api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ -139,7 +140,7 @@ def Chromium_Builder_steps(api):
            'GYP_DEFINES': 'fastbuild=1 component=static_library',
            'GYP_MSVS_VERSION': '2015'}
     api.python("gclient runhooks wrapper",
-               api.path["build"].join("scripts", "slave",
+               api.infra_paths['build'].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
@@ -150,12 +151,12 @@ def Chromium_Builder_steps(api):
     if "clobber" in api.properties:
         args.append("--clobber")
     api.python("compile",
-               api.path["build"].join("scripts", "slave", "compile.py"),
+               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
                args=args)
     # zip_build step
     step_result = api.python(
         "zip build",
-        api.path["build"].join("scripts", "slave", "zip_build.py"),
+        api.infra_paths['build'].join("scripts", "slave", "zip_build.py"),
         args=
         ["--json-urls", api.json.output(),
           "--target", "Release", '--build-url',
@@ -294,7 +295,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.path["build"].join("scripts", "slave",
+    api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ -326,7 +327,7 @@ def Chromium_Win_MiniInstaller_Tests_steps(api):
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=static_library'}
     api.python("gclient runhooks wrapper",
-               api.path["build"].join("scripts", "slave",
+               api.infra_paths['build'].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
@@ -334,7 +335,7 @@ def Chromium_Win_MiniInstaller_Tests_steps(api):
     # extract build step
     api.python(
         "extract build",
-        api.path["build"].join("scripts", "slave", "extract_build.py"),
+        api.infra_paths['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,
@@ -342,12 +343,12 @@ def Chromium_Win_MiniInstaller_Tests_steps(api):
     with api.step.defer_results():
       # test mini installer wrapper step
       api.python("test installer",
-                 api.path["build"].join("scripts", "slave", "chromium",
+                 api.infra_paths['build'].join("scripts", "slave", "chromium",
                                         "test_mini_installer_wrapper.py"),
                  args=["--target", "Release"])
       # process dumps step
       api.python("process dumps",
-                 api.path["build"].join("scripts", "slave", "process_dumps.py"),
+                 api.infra_paths['build'].join("scripts", "slave", "process_dumps.py"),
                  args=["--target", "Release"])
 
 
@@ -356,7 +357,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.path["build"].join("scripts", "slave",
+    api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ -388,7 +389,7 @@ def Win8_Tests__1__steps(api):
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=static_library'}
     api.python("gclient runhooks wrapper",
-               api.path["build"].join("scripts", "slave",
+               api.infra_paths['build'].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
@@ -396,7 +397,7 @@ def Win8_Tests__1__steps(api):
     # extract build step
     api.python(
         "extract build",
-        api.path["build"].join("scripts", "slave", "extract_build.py"),
+        api.infra_paths['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,
@@ -405,7 +406,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "base_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -420,7 +421,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "cacheinvalidation_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -435,7 +436,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "chrome_elf_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -450,7 +451,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "components_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -465,7 +466,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "courgette_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -480,7 +481,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "crypto_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -495,7 +496,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "extensions_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -510,7 +511,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "gcm_unit_tests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -525,7 +526,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "google_apis_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -540,7 +541,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "gpu_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -555,7 +556,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "url_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -570,7 +571,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "jingle_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -585,7 +586,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "device_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -600,7 +601,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "media_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -615,7 +616,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "net_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -630,7 +631,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "ppapi_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -645,7 +646,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "printing_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -660,7 +661,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "remoting_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -675,7 +676,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "sbox_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -690,7 +691,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "sbox_integration_tests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -705,7 +706,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "sbox_validation_tests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -720,7 +721,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "ipc_tests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -735,7 +736,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "sync_unit_tests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -750,7 +751,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "unit_tests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -765,7 +766,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "skia_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -780,7 +781,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "sql_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -795,7 +796,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "ui_base_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -810,7 +811,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "content_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -825,7 +826,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "views_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -840,7 +841,7 @@ def Win8_Tests__1__steps(api):
       # runtest step
       api.python(
           "installer_util_unittests",
-          api.path["build"].join("scripts", "slave", "runtest.py"),
+          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
           args=
           ['--target', 'Release', "--build-properties=%s" %
            api.json.dumps(build_properties,
@@ -854,7 +855,7 @@ def Win8_Tests__1__steps(api):
            'installer_util_unittests.exe', '--gtest_print_time'])
       # process dumps step
       api.python("process dumps",
-                 api.path["build"].join("scripts", "slave", "process_dumps.py"),
+                 api.infra_paths['build'].join("scripts", "slave", "process_dumps.py"),
                  args=["--target", "Release"])