Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.expected/Blink_Linux_LSan_ASan.json

Index: scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.expected/Blink_Linux_LSan_ASan.json
diff --git a/scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.expected/Blink_Linux_LSan_ASan.json b/scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.expected/Blink_Linux_LSan_ASan.json
index 9dcc93a7c49d805c7c44b99f67a2f1656d978ca0..c44947acdced68d9ea6b2501d18cc651d75a7f51 100644
--- a/scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.expected/Blink_Linux_LSan_ASan.json
+++ b/scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.expected/Blink_Linux_LSan_ASan.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlave",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'http://%s.googlecode.com/svn', 'llvm_url': 'http://llvm.org/svn/llvm-project', 'nacl_trunk': 'http://src.chromium.org/native_client/trunk', 'sourceforge_url': 'https://svn.code.sf.net/p/%(repo)s/code', 'webkit_trunk': 'http://src.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'http://%s.googlecode.com/svn', 'llvm_url': 'http://llvm.org/svn/llvm-project', 'nacl_trunk': 'http://src.chromium.org/native_client/trunk', 'sourceforge_url': 'https://svn.code.sf.net/p/%(repo)s/code', 'webkit_trunk': 'http://src.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/third_party/WebKit\": \"got_webkit_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]"
     },
@@ -84,8 +85,9 @@
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/runhooks_wrapper.py"
+      "[BUILD]/scripts/slave/runhooks_wrapper.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "CHROMIUM_GYP_SYNTAX_CHECK": "1",
       "DEPOT_TOOLS_UPDATE": "0",
@@ -100,7 +102,7 @@
       "python",
       "src/tools/clang/scripts/update.py"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "LLVM_URL": "http://llvm.org/svn/llvm-project"
     },
@@ -115,13 +117,14 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/compile.py",
+      "[BUILD]/scripts/slave/compile.py",
       "--target",
       "Release",
       "--build-tool=ninja",
@@ -129,20 +132,21 @@
       "--",
       "blink_tests"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "compile"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/runtest.py",
+      "[BUILD]/scripts/slave/runtest.py",
       "--run-python-script",
       "--target",
       "Release",
       "--build-properties={\"buildername\":\"Blink Linux LSan ASan\",\"buildnumber\":\"42\",\"got_revision\":\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\",\"got_revision_cp\":\"refs/heads/master@{#170242}\",\"got_swarming_client_revision\":\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\",\"got_swarming_client_revision_cp\":\"refs/heads/master@{#276089}\",\"got_v8_revision\":\"801ada225ddc271c132c3a35f03975671d43e399\",\"got_v8_revision_cp\":\"refs/heads/master@{#43426}\",\"got_webkit_revision\":\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\",\"got_webkit_revision_cp\":\"refs/heads/master@{#124383}\",\"mastername\":\"chromium.fyi\",\"recipe\":\"chromium.fyi.misc_block.recipe_autogen\",\"revision\":\"123456789abcdef\",\"slavename\":\"TestSlave\"}",
       "--factory-properties={\"additional_expectations\":[[\"third_party\",\"WebKit\",\"LayoutTests\",\"ASANExpectations\"]],\"archive_webkit_results\":false,\"asan\":true,\"blink_config\":\"blink\",\"gclient_env\":{\"CHROMIUM_GYP_SYNTAX_CHECK\":\"1\",\"DEPOT_TOOLS_UPDATE\":\"0\",\"GYP_DEFINES\":\"asan=1 lsan=1 component=static_library\",\"GYP_GENERATORS\":\"ninja\",\"LANDMINES_VERBOSE\":\"1\"},\"generate_gtest_json\":true,\"lsan\":true,\"time_out_ms\":\"48000\",\"webkit_dir\":\"third_party/WebKit/Source\",\"webkit_test_options\":[\"--enable-sanitizer\"]}",
       "--no-xvfb",
-      "[ROOT]/b/build/scripts/slave/chromium/layout_test_wrapper.py",
+      "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py",
       "--target",
       "Release",
       "-o",
@@ -157,6 +161,7 @@
       "48000",
       "--options=--enable-sanitizer"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "webkit_tests"
   },
   {