Revert "build: roll infra_paths changes"

scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json

Index: scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json
diff --git a/scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json b/scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json
index f2c87243ca8b7a0249b91f63b3b095e6dac95121..e9670e5111486b0f4af35efe096a145154174071 100644
--- a/scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json
+++ b/scripts/slave/recipes/webrtc/libfuzzer.expected/full_tryserver_webrtc_linux_libfuzzer_rel.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--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",
       "12853011",
       "--patchset",
@@ -30,6 +30,7 @@
       "src@HEAD",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -68,10 +69,11 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "GYP_CHROMIUM_NO_ACTION": "1",
-      "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
+      "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
@@ -80,27 +82,29 @@
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/depot_tools/gn.py",
-      "--root=[CWD]/src",
+      "[DEPOT_TOOLS]/gn.py",
+      "--root=[SLAVE_BUILD]/src",
       "gen",
       "//out/Release",
       "--args=ffmpeg_branding=\"Chrome\" rtc_use_h264=true use_libfuzzer=true is_asan=true is_debug=false target_cpu=\"x64\""
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gn"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/depot_tools/gn.py",
-      "--root=[CWD]/src",
+      "[DEPOT_TOOLS]/gn.py",
+      "--root=[SLAVE_BUILD]/src",
       "refs",
-      "[CWD]/src/out/Release",
+      "[SLAVE_BUILD]/src/out/Release",
       "--all",
       "--type=executable",
       "--as=output",
       "//webrtc/test/fuzzers:webrtc_fuzzer_main"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "calculate targets",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -125,9 +129,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",
@@ -137,7 +141,7 @@
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--goma-dir",
-      "[ROOT]/b/build/goma",
+      "[BUILD]/goma",
       "--goma-fail-fast",
       "--goma-disable-local-fallback",
       "--",
@@ -145,6 +149,7 @@
       "target2",
       "target3"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },