Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json

Index: scripts/slave/recipes/skia/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
diff --git a/scripts/slave/recipes/skia/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/scripts/slave/recipes/skia/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
index f382c1c5af3c90d0ad99dea9457ee8d7f5e527fa..8766cdd58700fb22aa184b143f8db39f9c11d96f 100644
--- a/scripts/slave/recipes/skia/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/scripts/slave/recipes/skia/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-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",
       "Test-Win8-MSVC-ShuttleB-CPU-AVX2-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]\\dm"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PYTHONPATH": "build\\scripts"
     },
@@ -93,6 +96,7 @@
       "[SWARM_OUT_DIR]\\dm",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs dm",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -112,9 +116,10 @@
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
-      "[CWD]\\tmp",
+      "[SLAVE_BUILD]\\tmp",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs tmp_dir",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -134,15 +139,15 @@
       "python",
       "-u",
       "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n  try:\n    with contextlib.closing(\n        urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n      hashes = w.read()\n      with open(sys.argv[1], 'w') as f:\n        f.write(hashes)\n        break\n  except Exception as e:\n    print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n    print e\n    if retry == RETRIES:\n      raise\n    waittime = WAIT_BASE * math.pow(2, retry)\n    print 'Retry in %d seconds.' % waittime\n    time.sleep(waittime)\n",
-      "[CWD]\\tmp\\uninteresting_hashes.txt"
+      "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt"
     ],
-    "cwd": "[CWD]\\skia",
+    "cwd": "[SLAVE_BUILD]\\skia",
     "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_gpu=0 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": "get uninteresting hashes",
     "~followup_annotations": [
@@ -181,14 +186,14 @@
   },
   {
     "cmd": [
-      "[CWD]\\out\\Release_x64\\dm",
+      "[SLAVE_BUILD]\\out\\Release_x64\\dm",
       "--undefok",
       "--resourcePath",
-      "[CWD]\\skia\\resources",
+      "[SLAVE_BUILD]\\skia\\resources",
       "--skps",
-      "[CWD]\\skps",
+      "[SLAVE_BUILD]\\skps",
       "--images",
-      "[CWD]\\images\\dm",
+      "[SLAVE_BUILD]\\images\\dm",
       "--nameByHash",
       "--properties",
       "gitHash",
@@ -219,18 +224,19 @@
       "os",
       "Win8",
       "--uninterestingHashesFile",
-      "[CWD]\\tmp\\uninteresting_hashes.txt",
+      "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt",
       "--writePath",
       "[SWARM_OUT_DIR]\\dm",
       "--nogpu",
       "--dummy-flags"
     ],
+    "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_gpu=0 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": "dm"
   },
@@ -240,6 +246,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@@@",