Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_mac_mac_chromium_gn_upload.json

Index: scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_mac_mac_chromium_gn_upload.json
diff --git a/scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_mac_mac_chromium_gn_upload.json b/scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_mac_mac_chromium_gn_upload.json
index 479ab8c2d1317a5b87e6a412dabdf62b4f486428..d964e0389c5f9a1dc3d3f5fa7f5932c4ef847df7 100644
--- a/scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_mac_mac_chromium_gn_upload.json
+++ b/scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_mac_mac_chromium_gn_upload.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--issue",
       "12853011",
       "--patchset",
@@ -31,6 +31,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -109,10 +110,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": "clang=1 component=static_library gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1",
+      "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
@@ -121,18 +123,19 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/tools/mb/mb.py",
+      "[SLAVE_BUILD]/src/tools/mb/mb.py",
       "gen",
       "-m",
       "tryserver.chromium.mac",
       "-b",
       "mac_chromium_gn_upload",
       "--config-file",
-      "[CWD]/src/tools/mb/mb_config.pyl",
+      "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
       "--goma-dir",
-      "[ROOT]/b/build/goma",
+      "[BUILD]/goma",
       "//out/Release"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "generate_build_files"
   },
   {
@@ -142,10 +145,11 @@
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
       "--src-dir",
-      "[CWD]/src",
+      "[SLAVE_BUILD]/src",
       "--output-json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -172,9 +176,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",
@@ -184,7 +188,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",
       "--clobber",
@@ -192,6 +196,7 @@
       "gn",
       "gn_unittests"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -203,9 +208,10 @@
   },
   {
     "cmd": [
-      "[CWD]/src/out/Release/gn",
+      "[SLAVE_BUILD]/src/out/Release/gn",
       "--version"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gn version"
   },
   {
@@ -225,24 +231,27 @@
       "--build-number=571",
       "gn_unittests"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gn_unittests"
   },
   {
     "cmd": [
       "strip",
-      "[CWD]/src/out/Release/gn"
+      "[SLAVE_BUILD]/src/out/Release/gn"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gn strip"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/depot_tools/upload_to_google_storage.py",
+      "[DEPOT_TOOLS]/upload_to_google_storage.py",
       "-b",
       "chromium-gn",
-      "[CWD]/src/out/Release/gn"
+      "[SLAVE_BUILD]/src/out/Release/gn"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "upload"
   },
   {
@@ -250,9 +259,10 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]/src/out/Release/gn.sha1",
+      "[SLAVE_BUILD]/src/out/Release/gn.sha1",
       "/path/to/tmp/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gn sha1",
     "~followup_annotations": [
       "@@@STEP_TEXT@0123456789abcdeffedcba987654321012345678@@@"