build: roll infra_paths changes

scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_official_try.json

Index: scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_official_try.json
diff --git a/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_official_try.json b/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_official_try.json
index 116ef61dd153fac910dae3b52c2c7adb56c3e9fc..545540ba4e450dfeae3fab20eec4c9d505ba260e 100644
--- a/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_official_try.json
+++ b/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_official_try.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_build"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
@@ -120,10 +116,9 @@
       "-u",
       "\nimport sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\nchromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])\n",
       "metrics.csv",
-      "[SLAVE_BUILD]\\src\\out\\Release"
+      "[CWD]\\src\\out\\Release"
     ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "rmwildcard metrics.csv in [SLAVE_BUILD]\\src\\out\\Release",
+    "name": "rmwildcard metrics.csv in [CWD]\\src\\out\\Release",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
@@ -138,10 +133,9 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]\\src\\syzygy\\unittests.gypi",
+      "[CWD]\\src\\syzygy\\unittests.gypi",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "read_unittests_gypi"
   },
   {
@@ -160,12 +154,11 @@
       "--builder-name=win_official_try",
       "--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"
   },
   {
@@ -184,12 +177,11 @@
       "--builder-name=win_official_try",
       "--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"
   },
   {
@@ -208,12 +200,11 @@
       "--builder-name=win_official_try",
       "--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"
   },
   {
@@ -223,10 +214,9 @@
       "-t",
       "-a",
       "public-read",
-      "[SLAVE_BUILD]\\src\\out\\Release\\metrics.csv",
+      "[CWD]\\src\\out\\Release\\metrics.csv",
       "gs://syzygy-archive/builds/metrics/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/official.csv"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "archive_metrics",
     "~followup_annotations": [
       "@@@STEP_LINK@archive@https://syzygy-archive.commondatastorage.googleapis.com/index.html?path=builds/metrics/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/official.csv/@@@"