Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json

Index: scripts/slave/recipes/skia/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
diff --git a/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
index f4e9d0340161d15fd8dc255df1895faf7bcbf9ac..8d899ab664aaa6d5216c29149dd43010565e3907 100644
--- a/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
+++ b/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
@@ -3,11 +3,11 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\skia\\tools\\buildbot_spec.py",
+      "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py",
       "/path/to/tmp/json",
       "Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot"
     ],
-    "cwd": "[CWD]\\skia",
+    "cwd": "[SLAVE_BUILD]\\skia",
     "name": "exec buildbot_spec.py",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -48,9 +48,10 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]\\tmp\\SKP_VERSION",
+      "[SLAVE_BUILD]\\tmp\\SKP_VERSION",
       "/path/to/tmp/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Get downloaded SKP_VERSION"
   },
   {
@@ -58,9 +59,10 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]\\tmp\\SK_IMAGE_VERSION",
+      "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION",
       "/path/to/tmp/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Get downloaded SK_IMAGE_VERSION"
   },
   {
@@ -70,6 +72,7 @@
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
       "[SWARM_OUT_DIR]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PYTHONPATH": "build\\scripts"
     },
@@ -93,6 +96,7 @@
       "[SWARM_OUT_DIR]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs data",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -109,14 +113,14 @@
   },
   {
     "cmd": [
-      "[CWD]\\out\\Release_x64\\nanobench",
+      "[SLAVE_BUILD]\\out\\Release_x64\\nanobench",
       "--undefok",
       "-i",
-      "[CWD]\\skia\\resources",
+      "[SLAVE_BUILD]\\skia\\resources",
       "--skps",
-      "[CWD]\\skps",
+      "[SLAVE_BUILD]\\skps",
       "--images",
-      "[CWD]\\images\\dm",
+      "[SLAVE_BUILD]\\images\\dm",
       "--nocpu",
       "--dummy-flags",
       "--outResultsFile",
@@ -144,12 +148,13 @@
       "os",
       "Win8"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "BUILDTYPE": "Release_x64",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_dump_stats=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
-      "PATH": "[CWD]\\depot_tools:%(PATH)s",
-      "SKIA_OUT": "[CWD]\\out"
+      "PATH": "[SLAVE_BUILD]\\depot_tools:%(PATH)s",
+      "SKIA_OUT": "[SLAVE_BUILD]\\out"
     },
     "name": "nanobench"
   },
@@ -161,6 +166,7 @@
       "[SWARM_OUT_DIR]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs perf_dir",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -181,6 +187,7 @@
       "-u",
       "import psutil\nfor p in psutil.process_iter():\n  try:\n    if p.name == 'mspdbsrv.exe':\n      p.kill()\n  except psutil._error.AccessDenied:\n    pass\n"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@import psutil@@@",