Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/infra.expected/Infra-PerCommit_initialcheckout.json

Index: scripts/slave/recipes/skia/infra.expected/Infra-PerCommit_initialcheckout.json
diff --git a/scripts/slave/recipes/skia/infra.expected/Infra-PerCommit_initialcheckout.json b/scripts/slave/recipes/skia/infra.expected/Infra-PerCommit_initialcheckout.json
index 38c7b71df57d4ac9b0b3370951aec94f9428bcea..00198649878614ca6fcb43b5f42a74abdf865daa 100644
--- a/scripts/slave/recipes/skia/infra.expected/Infra-PerCommit_initialcheckout.json
+++ b/scripts/slave/recipes/skia/infra.expected/Infra-PerCommit_initialcheckout.json
@@ -4,9 +4,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]/go/src",
+      "[SLAVE_BUILD]/go/src",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs makedirs go/src",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -26,8 +27,9 @@
       "git",
       "clone",
       "https://skia.googlesource.com/buildbot",
-      "[CWD]/go/src/go.skia.org/infra"
+      "[SLAVE_BUILD]/go/src/go.skia.org/infra"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "git clone"
   },
   {
@@ -36,7 +38,7 @@
       "fetch",
       "origin"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git fetch"
   },
   {
@@ -46,7 +48,7 @@
       "-d",
       "-f"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git clean"
   },
   {
@@ -56,7 +58,7 @@
       "--hard",
       "origin/master"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git reset"
   },
   {
@@ -66,11 +68,11 @@
       "-u",
       "./..."
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "env": {
       "GIT_USER_AGENT": "git/1.9.1",
-      "GOPATH": "[CWD]/go",
-      "PATH": "[CWD]/go/bin:%(PATH)s"
+      "GOPATH": "[SLAVE_BUILD]/go",
+      "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
     },
     "name": "update_deps"
   },
@@ -79,8 +81,9 @@
       "git",
       "clone",
       "https://skia.googlesource.com/buildbot",
-      "[CWD]/go/src/go.skia.org/infra"
+      "[SLAVE_BUILD]/go/src/go.skia.org/infra"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "git clone (2)"
   },
   {
@@ -89,7 +92,7 @@
       "fetch",
       "origin"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git fetch (2)"
   },
   {
@@ -99,7 +102,7 @@
       "-d",
       "-f"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git clean (2)"
   },
   {
@@ -109,7 +112,7 @@
       "--hard",
       "origin/master"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git reset (2)"
   },
   {
@@ -118,7 +121,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git rev-parse",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -131,11 +134,11 @@
       "get",
       "golang.org/x/tools/cmd/goimports"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "env": {
       "GIT_USER_AGENT": "git/1.9.1",
-      "GOPATH": "[CWD]/go",
-      "PATH": "[CWD]/go/bin:%(PATH)s"
+      "GOPATH": "[SLAVE_BUILD]/go",
+      "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
     },
     "name": "install goimports"
   },
@@ -145,11 +148,11 @@
       "get",
       "github.com/kisielk/errcheck"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "env": {
       "GIT_USER_AGENT": "git/1.9.1",
-      "GOPATH": "[CWD]/go",
-      "PATH": "[CWD]/go/bin:%(PATH)s"
+      "GOPATH": "[SLAVE_BUILD]/go",
+      "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
     },
     "name": "install errcheck"
   },
@@ -157,11 +160,11 @@
     "cmd": [
       "./setup_test_db"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra/go/database",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra/go/database",
     "env": {
       "GIT_USER_AGENT": "git/1.9.1",
-      "GOPATH": "[CWD]/go",
-      "PATH": "[CWD]/go/bin:%(PATH)s"
+      "GOPATH": "[SLAVE_BUILD]/go",
+      "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
     },
     "name": "setup database"
   },
@@ -171,12 +174,12 @@
       "-u",
       "run_unittests"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "env": {
       "GIT_USER_AGENT": "git/1.9.1",
-      "GOPATH": "[CWD]/go",
+      "GOPATH": "[SLAVE_BUILD]/go",
       "KARMA_PORT": "15001",
-      "PATH": "[CWD]/go/bin:%(PATH)s"
+      "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
     },
     "name": "run_unittests"
   },