build: roll infra_paths changes

scripts/slave/recipes/syzygy/kasko_official.expected/full_master_client_syzygy_Kasko_Official.json

Index: scripts/slave/recipes/syzygy/kasko_official.expected/full_master_client_syzygy_Kasko_Official.json
diff --git a/scripts/slave/recipes/syzygy/kasko_official.expected/full_master_client_syzygy_Kasko_Official.json b/scripts/slave/recipes/syzygy/kasko_official.expected/full_master_client_syzygy_Kasko_Official.json
index e6c96293b0f3dbfa7962c03ede031a5bc9aacafe..85238878469ecfbb782d14831d35b4da9851ee54 100644
--- a/scripts/slave/recipes/syzygy/kasko_official.expected/full_master_client_syzygy_Kasko_Official.json
+++ b/scripts/slave/recipes/syzygy/kasko_official.expected/full_master_client_syzygy_Kasko_Official.json
@@ -5,7 +5,6 @@
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "taskkill"
   },
   {
@@ -20,13 +19,13 @@
       "--slave",
       "vm331-m3",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/github.com/google/syzygy.git/'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/syzygy/internal.DEPS.git'}]",
+      "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/github.com/google/syzygy.git/'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/syzygy/internal.DEPS.git'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\"}",
       "--git-cache-dir",
-      "[GIT_CACHE]",
+      "[ROOT]\\b\\build\\slave\\cache_dir",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -34,7 +33,6 @@
       "--force",
       "--output_manifest"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -74,7 +72,6 @@
       "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "GYP_DEFINES": "official_build=1 target_arch=ia32",
@@ -98,9 +95,9 @@
       "--target",
       "Release",
       "--src-dir",
-      "[SLAVE_BUILD]\\src",
+      "[CWD]\\src",
       "--goma-cache-dir",
-      "[GOMA_CACHE]",
+      "[ROOT]\\b\\build\\slave\\goma_cache",
       "--build-tool",
       "ninja",
       "--ninja-ensure-up-to-date",
@@ -108,7 +105,6 @@
       "--",
       "official_kasko_build"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
@@ -119,10 +115,9 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]\\src\\syzygy\\kasko\\unittests.gypi",
+      "[CWD]\\src\\syzygy\\kasko\\unittests.gypi",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "read_unittests_gypi"
   },
   {
@@ -141,12 +136,11 @@
       "--builder-name=Kasko Official",
       "--slave-name=vm331-m3",
       "--build-number=571",
-      "[SLAVE_BUILD]\\src\\out\\Release\\bar_unittests.exe",
+      "[CWD]\\src\\out\\Release\\bar_unittests.exe",
       "--single-process-tests",
       "--test-launcher-timeout=300000",
       "--gtest_print_time"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "bar_unittests"
   },
   {
@@ -165,12 +159,11 @@
       "--builder-name=Kasko Official",
       "--slave-name=vm331-m3",
       "--build-number=571",
-      "[SLAVE_BUILD]\\src\\out\\Release\\baz_unittests.exe",
+      "[CWD]\\src\\out\\Release\\baz_unittests.exe",
       "--single-process-tests",
       "--test-launcher-timeout=300000",
       "--gtest_print_time"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "baz_unittests"
   },
   {
@@ -189,12 +182,11 @@
       "--builder-name=Kasko Official",
       "--slave-name=vm331-m3",
       "--build-number=571",
-      "[SLAVE_BUILD]\\src\\out\\Release\\foo_unittests.exe",
+      "[CWD]\\src\\out\\Release\\foo_unittests.exe",
       "--single-process-tests",
       "--test-launcher-timeout=300000",
       "--gtest_print_time"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "foo_unittests"
   },
   {
@@ -202,10 +194,9 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]\\src\\syzygy\\kasko\\VERSION",
+      "[CWD]\\src\\syzygy\\kasko\\VERSION",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "read_version"
   },
   {
@@ -214,10 +205,9 @@
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\syzygy\\gsutil_cp_dir.py",
       "--public-read",
-      "[SLAVE_BUILD]\\src\\out\\Release\\archive",
+      "[CWD]\\src\\out\\Release\\archive",
       "gs://syzygy-archive/builds/official/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "archive_binaries",
     "~followup_annotations": [
       "@@@STEP_LINK@0.0.0.1 archive@https://syzygy-archive.commondatastorage.googleapis.com/index.html?path=builds/official/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/@@@"
@@ -227,12 +217,11 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]\\src\\syzygy\\internal\\scripts\\archive_symbols.py",
+      "[CWD]\\src\\syzygy\\internal\\scripts\\archive_symbols.py",
       "-s",
       "-b",
-      "[SLAVE_BUILD]\\src\\out\\Release\\*kasko.dll"
+      "[CWD]\\src\\out\\Release\\*kasko.dll"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "upload_symbols"
   },
   {