Revert "build: roll infra_paths changes"

scripts/slave/recipes/closure_compilation.expected/main.json

Index: scripts/slave/recipes/closure_compilation.expected/main.json
diff --git a/scripts/slave/recipes/closure_compilation.expected/main.json b/scripts/slave/recipes/closure_compilation.expected/main.json
index 82a31b6a5d0e516b5fddcdecc37d499b375bdada..ee28d41b08f4b1c89783693da05584c3fde2a534 100644
--- a/scripts/slave/recipes/closure_compilation.expected/main.json
+++ b/scripts/slave/recipes/closure_compilation.expected/main.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]",
       "--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]"
     },
@@ -100,15 +101,17 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/third_party/closure_compiler/run_tests.py"
+      "[SLAVE_BUILD]/src/third_party/closure_compiler/run_tests.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "run_tests"
   },
   {
     "cmd": [
-      "[CWD]/src/build/gyp_chromium",
-      "[CWD]/src/third_party/closure_compiler/compiled_resources.gyp"
+      "[SLAVE_BUILD]/src/build/gyp_chromium",
+      "[SLAVE_BUILD]/src/third_party/closure_compiler/compiled_resources.gyp"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "generate_gyp_files"
   },
   {
@@ -126,13 +129,14 @@
       "--target",
       "Release",
       "--src-dir",
-      "[CWD]/src",
+      "[SLAVE_BUILD]/src",
       "--goma-cache-dir",
-      "[ROOT]/b/build/slave/goma_cache",
+      "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -140,9 +144,10 @@
   },
   {
     "cmd": [
-      "[CWD]/src/build/gyp_chromium",
-      "[CWD]/src/third_party/closure_compiler/compiled_resources2.gyp"
+      "[SLAVE_BUILD]/src/build/gyp_chromium",
+      "[SLAVE_BUILD]/src/third_party/closure_compiler/compiled_resources2.gyp"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "generate_v2_gyp_files"
   },
   {
@@ -160,13 +165,14 @@
       "--target",
       "Release",
       "--src-dir",
-      "[CWD]/src",
+      "[SLAVE_BUILD]/src",
       "--goma-cache-dir",
-      "[ROOT]/b/build/slave/goma_cache",
+      "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },