Revert "build: roll infra_paths changes"

scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_baremetal.json

Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_baremetal.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_baremetal.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_baremetal.json
index 647be142ab319e33dafef6971a8715336ef8ce2d..7eef09ff99192aa4fceaae39ee237fd89f4dfcfb 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_baremetal.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_baremetal.json
@@ -11,13 +11,13 @@
       "--slave",
       "slavename",
       "--spec",
-      "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]\\b\\build\\slave\\cache_dir",
+      "[GIT_CACHE]",
       "--issue",
       "666666",
       "--patchset",
@@ -30,6 +30,7 @@
       "src@12345",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -66,8 +67,9 @@
       "python",
       "-u",
       "RECIPE_MODULE[build::webrtc]\\resources\\cleanup_files.py",
-      "[CWD]\\src\\out"
+      "[SLAVE_BUILD]\\src\\out"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "clean test output files"
   },
   {
@@ -79,6 +81,7 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
@@ -88,9 +91,10 @@
       "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": "chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]\\b\\build\\goma' rtc_use_264=1 target_arch=ia32 use_goma=1",
+      "GYP_DEFINES": "chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' rtc_use_264=1 target_arch=ia32 use_goma=1",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
@@ -110,9 +114,9 @@
       "--target",
       "Release",
       "--src-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--goma-cache-dir",
-      "[ROOT]\\b\\build\\slave\\goma_cache",
+      "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--compiler",
@@ -122,12 +126,13 @@
       "--goma-service-account-json-file",
       "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "--goma-dir",
-      "[ROOT]\\b\\build\\goma",
+      "[BUILD]\\goma",
       "--goma-fail-fast",
       "--goma-disable-local-fallback",
       "--",
       "All"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
@@ -143,6 +148,7 @@
       "-u",
       "RECIPE_MODULE[build::webrtc]\\resources\\ensure_webcam_is_running.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "webcam_check"
   },
   {
@@ -166,6 +172,7 @@
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "audio_device_tests.exe"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "audio_device_tests"
   },
   {
@@ -190,6 +197,7 @@
       "voe_auto_test.exe",
       "--automated"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "voe_auto_test"
   },
   {
@@ -213,6 +221,7 @@
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "video_capture_tests.exe"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "video_capture_tests"
   },
   {
@@ -236,6 +245,7 @@
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "webrtc_perf_tests.exe"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "webrtc_perf_tests"
   },
   {