Revert "build: roll infra_paths changes"

scripts/slave/recipes/win_analyze.expected/full_chromium_fyi_Chromium_Windows_Analyze.json

Index: scripts/slave/recipes/win_analyze.expected/full_chromium_fyi_Chromium_Windows_Analyze.json
diff --git a/scripts/slave/recipes/win_analyze.expected/full_chromium_fyi_Chromium_Windows_Analyze.json b/scripts/slave/recipes/win_analyze.expected/full_chromium_fyi_Chromium_Windows_Analyze.json
index 199d8ae326349431b3cf70f7342830c78837979d..79d318cd92d87f1ee77f9b7e400890355d645f2f 100644
--- a/scripts/slave/recipes/win_analyze.expected/full_chromium_fyi_Chromium_Windows_Analyze.json
+++ b/scripts/slave/recipes/win_analyze.expected/full_chromium_fyi_Chromium_Windows_Analyze.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]"
     },
@@ -103,10 +104,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=shared_library fastbuild=2 gomadir='[ROOT]\\b\\build\\goma' target_arch=ia32 use_goma=0 win_analyze=1",
+      "GYP_DEFINES": "chromium_win_pch=0 component=shared_library fastbuild=2 gomadir='[BUILD]\\goma' target_arch=ia32 use_goma=0 win_analyze=1",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
@@ -115,16 +117,17 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\src\\tools\\mb\\mb.py",
+      "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
       "gen",
       "-m",
       "chromium.fyi",
       "-b",
       "Chromium Windows Analyze",
       "--config-file",
-      "[CWD]\\src\\tools\\mb\\mb_config.pyl",
+      "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
       "//out/Debug"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "generate_build_files"
   },
   {
@@ -142,15 +145,16 @@
       "--target",
       "Debug",
       "--src-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--goma-cache-dir",
-      "[ROOT]\\b\\build\\slave\\goma_cache",
+      "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--clobber",
       "--",
       "chrome"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },