Revert "build: roll infra_paths changes"

scripts/slave/recipes/run_presubmit.expected/infra_with_runhooks_and_gerrit.json

Index: scripts/slave/recipes/run_presubmit.expected/infra_with_runhooks_and_gerrit.json
diff --git a/scripts/slave/recipes/run_presubmit.expected/infra_with_runhooks_and_gerrit.json b/scripts/slave/recipes/run_presubmit.expected/infra_with_runhooks_and_gerrit.json
index 4f6c4338a37110999899426db7fa6695af15cddd..2331ca622049d3f791f83986af8c65a0258d4574 100644
--- a/scripts/slave/recipes/run_presubmit.expected/infra_with_runhooks_and_gerrit.json
+++ b/scripts/slave/recipes/run_presubmit.expected/infra_with_runhooks_and_gerrit.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
       "--root",
       "infra",
       "--revision_mapping_file",
       "{\"infra\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--gerrit_repo",
       "https://chromium.googlesource.com/infra/infra",
       "--gerrit_ref",
@@ -28,6 +28,7 @@
       "infra@HEAD",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -71,7 +72,7 @@
       "-m",
       "Committed patch"
     ],
-    "cwd": "[CWD]/infra",
+    "cwd": "[SLAVE_BUILD]/infra",
     "name": "commit git patch"
   },
   {
@@ -81,6 +82,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -99,7 +101,7 @@
       "https://chromium-review.googlesource.com",
       "--gerrit_fetch",
       "--root",
-      "[CWD]/infra",
+      "[SLAVE_BUILD]/infra",
       "--commit",
       "--verbose",
       "--verbose",
@@ -112,6 +114,7 @@
       "--upstream",
       "5e03a58dc0850e5137a8ebbce29610670c756aed"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },