Revert "build: roll infra_paths changes"

scripts/slave/recipes/boringssl.expected/win32.json

Index: scripts/slave/recipes/boringssl.expected/win32.json
diff --git a/scripts/slave/recipes/boringssl.expected/win32.json b/scripts/slave/recipes/boringssl.expected/win32.json
index b11ff7b84f3d3149ba471c762df16e8205189eb9..ac7301f613d2532eaebaa8bac6190ef487d26c24 100644
--- a/scripts/slave/recipes/boringssl.expected/win32.json
+++ b/scripts/slave/recipes/boringssl.expected/win32.json
@@ -11,13 +11,13 @@
       "--slave",
       "slavename",
       "--spec",
-      "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': 'util/bot/DEPS', 'managed': True, 'name': 'boringssl', 'url': 'https://boringssl.googlesource.com/boringssl.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'util/bot/DEPS', 'managed': True, 'name': 'boringssl', 'url': 'https://boringssl.googlesource.com/boringssl.git'}]",
       "--root",
       "boringssl",
       "--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": {
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -63,8 +65,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]\\boringssl\\build"
+      "[SLAVE_BUILD]\\boringssl\\build"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree clean",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -82,9 +85,10 @@
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
-      "[CWD]\\boringssl\\build",
+      "[SLAVE_BUILD]\\boringssl\\build",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs mkdir",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -103,40 +107,41 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\boringssl\\util\\bot\\go\\env.py",
+      "[SLAVE_BUILD]\\boringssl\\util\\bot\\go\\env.py",
       "python",
-      "[CWD]\\boringssl\\util\\bot\\vs_env.py",
+      "[SLAVE_BUILD]\\boringssl\\util\\bot\\vs_env.py",
       "x86",
-      "[CWD]\\boringssl\\util\\bot\\cmake-win32\\bin\\cmake.exe",
+      "[SLAVE_BUILD]\\boringssl\\util\\bot\\cmake-win32\\bin\\cmake.exe",
       "-GNinja",
-      "-DCMAKE_ASM_NASM_COMPILER=[CWD]/boringssl/util/bot/yasm-win32.exe",
-      "-DPERL_EXECUTABLE=[CWD]\\boringssl\\util\\bot\\perl-win32\\perl\\bin\\perl.exe",
-      "[CWD]\\boringssl"
+      "-DCMAKE_ASM_NASM_COMPILER=[SLAVE_BUILD]/boringssl/util/bot/yasm-win32.exe",
+      "-DPERL_EXECUTABLE=[SLAVE_BUILD]\\boringssl\\util\\bot\\perl-win32\\perl\\bin\\perl.exe",
+      "[SLAVE_BUILD]\\boringssl"
     ],
-    "cwd": "[CWD]\\boringssl\\build",
+    "cwd": "[SLAVE_BUILD]\\boringssl\\build",
     "name": "cmake"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\boringssl\\util\\bot\\go\\env.py",
+      "[SLAVE_BUILD]\\boringssl\\util\\bot\\go\\env.py",
       "python",
-      "[CWD]\\boringssl\\util\\bot\\vs_env.py",
+      "[SLAVE_BUILD]\\boringssl\\util\\bot\\vs_env.py",
       "x86",
       "ninja",
       "-C",
-      "[CWD]\\boringssl\\build"
+      "[SLAVE_BUILD]\\boringssl\\build"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "ninja"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\boringssl\\util\\bot\\go\\env.py",
+      "[SLAVE_BUILD]\\boringssl\\util\\bot\\go\\env.py",
       "python",
-      "[CWD]\\boringssl\\util\\bot\\vs_env.py",
+      "[SLAVE_BUILD]\\boringssl\\util\\bot\\vs_env.py",
       "x86",
       "go",
       "run",
@@ -144,7 +149,7 @@
       "-json-output",
       "/path/to/tmp/json"
     ],
-    "cwd": "[CWD]\\boringssl",
+    "cwd": "[SLAVE_BUILD]\\boringssl",
     "name": "unit tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@test_utils.test_results@{@@@",
@@ -193,9 +198,9 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\boringssl\\util\\bot\\go\\env.py",
+      "[SLAVE_BUILD]\\boringssl\\util\\bot\\go\\env.py",
       "python",
-      "[CWD]\\boringssl\\util\\bot\\vs_env.py",
+      "[SLAVE_BUILD]\\boringssl\\util\\bot\\vs_env.py",
       "x86",
       "go",
       "test",
@@ -203,7 +208,7 @@
       "-json-output",
       "/path/to/tmp/json"
     ],
-    "cwd": "[CWD]\\boringssl\\ssl\\test\\runner",
+    "cwd": "[SLAVE_BUILD]\\boringssl\\ssl\\test\\runner",
     "name": "ssl tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@test_utils.test_results@{@@@",