Revert "build: roll infra_paths changes"

scripts/slave/recipes/run_presubmit.expected/chromium_with_auth.json

Index: scripts/slave/recipes/run_presubmit.expected/chromium_with_auth.json
diff --git a/scripts/slave/recipes/run_presubmit.expected/chromium_with_auth.json b/scripts/slave/recipes/run_presubmit.expected/chromium_with_auth.json
index e6aa76e94e0092025dbf5f6969a239ec946dce47..4eece2f8986ea2384c6cc7e6c249c20bad6cd601 100644
--- a/scripts/slave/recipes/run_presubmit.expected/chromium_with_auth.json
+++ b/scripts/slave/recipes/run_presubmit.expected/chromium_with_auth.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",
@@ -25,15 +25,16 @@
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--apply_issue_email_file",
-      "[ROOT]/b/build/site_config/.rietveld_client_email",
+      "[BUILD]/site_config/.rietveld_client_email",
       "--apply_issue_key_file",
-      "[ROOT]/b/build/site_config/.rietveld_secret_key",
+      "[BUILD]/site_config/.rietveld_secret_key",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -117,7 +118,7 @@
       "-m",
       "Committed patch"
     ],
-    "cwd": "[CWD]/src",
+    "cwd": "[SLAVE_BUILD]/src",
     "name": "commit git patch"
   },
   {
@@ -133,11 +134,11 @@
       "https://codereview.chromium.org",
       "--rietveld_fetch",
       "--rietveld_email_file",
-      "[ROOT]/b/build/site_config/.rietveld_client_email",
+      "[BUILD]/site_config/.rietveld_client_email",
       "--rietveld_private_key_file",
-      "[ROOT]/b/build/site_config/.rietveld_secret_key",
+      "[BUILD]/site_config/.rietveld_secret_key",
       "--root",
-      "[CWD]/src",
+      "[SLAVE_BUILD]/src",
       "--commit",
       "--verbose",
       "--verbose",
@@ -150,6 +151,7 @@
       "--upstream",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },