Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.expected/Linux_Audio.json

Index: scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.expected/Linux_Audio.json
diff --git a/scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.expected/Linux_Audio.json b/scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.expected/Linux_Audio.json
index b2f39ae112cdfdc5c10bcbd3382ddfa02b241fd0..e62b408befc497a41846396891e7cc39ca59bf6d 100644
--- a/scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.expected/Linux_Audio.json
+++ b/scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.expected/Linux_Audio.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlave",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'src/third_party/WebKit/LayoutTests': None}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/tools/grit/grit/test/data': None}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn.chromium.org/chrome-internal/trunk/src-internal'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'src/third_party/WebKit/LayoutTests': None}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/tools/grit/grit/test/data': None}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn.chromium.org/chrome-internal/trunk/src-internal'}]",
       "--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",
@@ -103,25 +105,27 @@
       "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",
       "content_unittests",
       "media_unittests"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "compile"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/runtest.py",
+      "[BUILD]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--build-properties={\"buildername\":\"Linux Audio\",\"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.gpu.fyi\",\"recipe\":\"chromium.gpu.fyi.recipe_autogen\",\"slavename\":\"TestSlave\"}",
@@ -139,13 +143,14 @@
       "content_unittests",
       "--gtest_print_time"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "content_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/runtest.py",
+      "[BUILD]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--build-properties={\"buildername\":\"Linux Audio\",\"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.gpu.fyi\",\"recipe\":\"chromium.gpu.fyi.recipe_autogen\",\"slavename\":\"TestSlave\"}",
@@ -163,6 +168,7 @@
       "media_unittests",
       "--gtest_print_time"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "media_unittests"
   },
   {