Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_win_win8_chromium_gn_upload.json
diff --git a/scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_win_win8_chromium_gn_upload.json b/scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_win_win8_chromium_gn_upload.json
index 075e6172e7eb75a10373244b53b7ae94f149e8d7..a9cf3336c595441a78a4518db41242c2057799e6 100644
--- a/scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_win_win8_chromium_gn_upload.json
+++ b/scripts/slave/recipes/chromium_gn_upload.expected/full_tryserver_chromium_win_win8_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": "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "GYP_CHROMIUM_NO_ACTION": "1",
-      "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[ROOT]\\b\\build\\goma' target_arch=ia32 use_goma=1",
+      "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 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.win",
       "-b",
       "win8_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"
   },
   {
@@ -150,9 +153,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",
@@ -162,7 +165,7 @@
       "--goma-service-account-json-file",
       "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "--goma-dir",
-      "[ROOT]\\b\\build\\goma",
+      "[BUILD]\\goma",
       "--goma-fail-fast",
       "--goma-disable-local-fallback",
       "--clobber",
@@ -170,6 +173,7 @@
       "gn",
       "gn_unittests"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
@@ -181,9 +185,10 @@
   },
   {
     "cmd": [
-      "[CWD]\\src\\out\\Release\\gn.exe",
+      "[SLAVE_BUILD]\\src\\out\\Release\\gn.exe",
       "--version"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gn version"
   },
   {
@@ -203,17 +208,19 @@
       "--build-number=571",
       "gn_unittests.exe"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gn_unittests"
   },
   {
     "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.exe"
+      "[SLAVE_BUILD]\\src\\out\\Release\\gn.exe"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "upload"
   },
   {
@@ -221,9 +228,10 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]\\src\\out\\Release\\gn.exe.sha1",
+      "[SLAVE_BUILD]\\src\\out\\Release\\gn.exe.sha1",
       "/path/to/tmp/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gn sha1",
     "~followup_annotations": [
       "@@@STEP_TEXT@0123456789abcdeffedcba987654321012345678@@@"