Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/swarm_compile.expected/Build-Win-MSVC-x86-Debug-VS2015.json

Index: scripts/slave/recipes/skia/swarm_compile.expected/Build-Win-MSVC-x86-Debug-VS2015.json
diff --git a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Win-MSVC-x86-Debug-VS2015.json b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Win-MSVC-x86-Debug-VS2015.json
index 47d064db2e64492d05b1cef099b0503013875db7..6fde84f0727e80428f2c59b8935e78361e003478 100644
--- a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Win-MSVC-x86-Debug-VS2015.json
+++ b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Win-MSVC-x86-Debug-VS2015.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",
       "Build-Win-MSVC-x86-Debug-VS2015"
     ],
-    "cwd": "[CWD]\\skia",
+    "cwd": "[SLAVE_BUILD]\\skia",
     "name": "exec buildbot_spec.py",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -45,12 +45,13 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py",
+      "[SLAVE_BUILD]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py",
       "--win_toolchain_json",
-      "[CWD]\\src\\build\\win_toolchain.json",
+      "[SLAVE_BUILD]\\src\\build\\win_toolchain.json",
       "--depot_tools_parent_dir",
-      "[CWD]"
+      "[SLAVE_BUILD]"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "bootstrap win toolchain"
   },
   {
@@ -59,14 +60,14 @@
       "make.py",
       "most"
     ],
-    "cwd": "[CWD]\\skia",
+    "cwd": "[SLAVE_BUILD]\\skia",
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "CHROME_PATH": "[CWD]\\src",
+      "CHROME_PATH": "[SLAVE_BUILD]\\src",
       "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
-      "PATH": "[CWD]\\depot_tools:%(PATH)s",
-      "SKIA_OUT": "[CWD]\\out"
+      "PATH": "[SLAVE_BUILD]\\depot_tools:%(PATH)s",
+      "SKIA_OUT": "[SLAVE_BUILD]\\out"
     },
     "name": "build most"
   },
@@ -75,9 +76,10 @@
       "python",
       "-u",
       "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa']\n\ntry:\n  os.makedirs(dst)\nexcept OSError as e:\n  if e.errno != errno.EEXIST:\n    raise\n\nfor pattern in build_products_whitelist:\n  path = os.path.join(src, pattern)\n  for f in glob.glob(path):\n    print 'Copying build product %s to %s' % (f, dst)\n    shutil.move(f, dst)\n",
-      "[CWD]\\out\\Debug",
+      "[SLAVE_BUILD]\\out\\Debug",
       "[SWARM_OUT_DIR]\\out\\Debug"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "copy build products",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@import errno@@@",
@@ -110,6 +112,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@@@",