Revert "build: roll infra_paths changes"

scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorTrue.json

Index: scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorTrue.json
diff --git a/scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorTrue.json b/scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorTrue.json
index 3b21c9e2a032c08e3f3c530393761b9a8df559b6..e663b91eb1fde2ad1d60cf2cfa21b8553803e0a5 100644
--- a/scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorTrue.json
+++ b/scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorTrue.json
@@ -6,8 +6,9 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'dartium_base': 'svn://svn-mirror.golo.chromium.org', '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': 'dartium.deps', 'url': 'svn://svn-mirror.golo.chromium.org/dart/branches/bleeding_edge/deps/dartium.deps'}]"
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'dartium_base': 'svn://svn-mirror.golo.chromium.org', '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': 'dartium.deps', 'url': 'svn://svn-mirror.golo.chromium.org/dart/branches/bleeding_edge/deps/dartium.deps'}]"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -28,6 +29,7 @@
       "--output-json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -74,9 +76,10 @@
       "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_DEFINES": "clang=1 component=static_library gomadir='[ROOT]/b/build/goma' linux_strip_binary=1 target_arch=x64 use_goma=1",
+      "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' linux_strip_binary=1 target_arch=x64 use_goma=1",
       "GYP_GENERATORS": "ninja",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -89,10 +92,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"
     },
@@ -119,9 +123,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",
@@ -131,11 +135,12 @@
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--goma-dir",
-      "[ROOT]/b/build/goma",
+      "[BUILD]/goma",
       "--",
       "All",
       "chromium_builder_tests"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -149,9 +154,10 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/dart/tools/dartium/multivm_archive.py",
+      "[SLAVE_BUILD]/src/dart/tools/dartium/multivm_archive.py",
       "12345"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive_build"
   },
   {