Revert "build: roll infra_paths changes"

scripts/slave/recipes/pdfium.expected/mac_xfa.json

Index: scripts/slave/recipes/pdfium.expected/mac_xfa.json
diff --git a/scripts/slave/recipes/pdfium.expected/mac_xfa.json b/scripts/slave/recipes/pdfium.expected/mac_xfa.json
index e1cceaa9de0eeca977793462b9f7657fed937a67..c2ae57f6dbe8d584b81246cab1514b6227e4f0b6 100644
--- a/scripts/slave/recipes/pdfium.expected/mac_xfa.json
+++ b/scripts/slave/recipes/pdfium.expected/mac_xfa.json
@@ -11,13 +11,13 @@
       "--slave",
       "test_slave",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]",
       "--root",
       "pdfium",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,6 +25,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -53,6 +54,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GYP_DEFINES": "pdf_enable_v8=1 pdf_enable_xfa=1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
@@ -63,55 +65,56 @@
     "cmd": [
       "ninja",
       "-C",
-      "[CWD]/pdfium/out/Debug"
+      "[SLAVE_BUILD]/pdfium/out/Debug"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "compile with ninja"
   },
   {
     "cmd": [
-      "[CWD]/pdfium/out/Debug/pdfium_unittests"
+      "[SLAVE_BUILD]/pdfium/out/Debug/pdfium_unittests"
     ],
-    "cwd": "[CWD]/pdfium",
+    "cwd": "[SLAVE_BUILD]/pdfium",
     "name": "unittests"
   },
   {
     "cmd": [
-      "[CWD]/pdfium/out/Debug/pdfium_embeddertests"
+      "[SLAVE_BUILD]/pdfium/out/Debug/pdfium_embeddertests"
     ],
-    "cwd": "[CWD]/pdfium",
+    "cwd": "[SLAVE_BUILD]/pdfium",
     "name": "embeddertests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/pdfium/testing/tools/run_javascript_tests.py",
+      "[SLAVE_BUILD]/pdfium/testing/tools/run_javascript_tests.py",
       "--build-dir",
       "out/Debug"
     ],
-    "cwd": "[CWD]/pdfium",
+    "cwd": "[SLAVE_BUILD]/pdfium",
     "name": "javascript tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/pdfium/testing/tools/run_pixel_tests.py",
+      "[SLAVE_BUILD]/pdfium/testing/tools/run_pixel_tests.py",
       "--build-dir",
       "out/Debug"
     ],
-    "cwd": "[CWD]/pdfium",
+    "cwd": "[SLAVE_BUILD]/pdfium",
     "name": "pixel tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/pdfium/testing/tools/run_corpus_tests.py",
+      "[SLAVE_BUILD]/pdfium/testing/tools/run_corpus_tests.py",
       "--build-dir",
       "out/Debug"
     ],
-    "cwd": "[CWD]/pdfium",
+    "cwd": "[SLAVE_BUILD]/pdfium",
     "name": "corpus tests"
   },
   {