Revert "build: roll infra_paths changes"

scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x64_dbg_clobber.json

Index: scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x64_dbg_clobber.json
diff --git a/scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x64_dbg_clobber.json b/scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x64_dbg_clobber.json
index 81f63f35a5985d31796db36bd65d5880afe02d85..f0f846d3fa2331b62d805e47ae1c0c0f9a638abd 100644
--- a/scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x64_dbg_clobber.json
+++ b/scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x64_dbg_clobber.json
@@ -6,8 +6,9 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'crashpad', 'url': 'https://chromium.googlesource.com/crashpad/crashpad.git'}]"
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'crashpad', 'url': 'https://chromium.googlesource.com/crashpad/crashpad.git'}]"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -26,6 +27,7 @@
       "--output-json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -46,8 +48,9 @@
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
-      "[CWD]/crashpad/out"
+      "[SLAVE_BUILD]/crashpad/out"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree out",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -67,6 +70,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -76,25 +80,28 @@
     "cmd": [
       "ninja",
       "-C",
-      "[CWD]/crashpad/out/Debug"
+      "[SLAVE_BUILD]/crashpad/out/Debug"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "compile with ninja"
   },
   {
     "cmd": [
       "ninja",
       "-C",
-      "[CWD]/crashpad/out/Debug_x64"
+      "[SLAVE_BUILD]/crashpad/out/Debug_x64"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "compile with ninja (2)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/crashpad/build/run_tests.py",
+      "[SLAVE_BUILD]/crashpad/build/run_tests.py",
       "Debug_x64"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "run tests"
   },
   {