build: roll infra_paths changes

scripts/slave/recipe_modules/zip/example.expected/mac.json

Index: scripts/slave/recipe_modules/zip/example.expected/mac.json
diff --git a/scripts/slave/recipe_modules/zip/example.expected/mac.json b/scripts/slave/recipe_modules/zip/example.expected/mac.json
index 703321822ce7f01cd434b98d802c7e5c7c9241f3..175221f88566b18cccd336862315724f942e46dd 100644
--- a/scripts/slave/recipe_modules/zip/example.expected/mac.json
+++ b/scripts/slave/recipe_modules/zip/example.expected/mac.json
@@ -2,17 +2,15 @@
   {
     "cmd": [
       "touch",
-      "[TMP_BASE]/zip-example_tmp_1/a"
+      "[TMP]/zip-example_tmp_1/a"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "touch a"
   },
   {
     "cmd": [
       "touch",
-      "[TMP_BASE]/zip-example_tmp_1/b"
+      "[TMP]/zip-example_tmp_1/b"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "touch b"
   },
   {
@@ -20,10 +18,9 @@
       "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",
-      "[TMP_BASE]/zip-example_tmp_1/sub/dir",
+      "[TMP]/zip-example_tmp_1/sub/dir",
       "511"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs mkdirs",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -41,9 +38,8 @@
   {
     "cmd": [
       "touch",
-      "[TMP_BASE]/zip-example_tmp_1/sub/dir/c"
+      "[TMP]/zip-example_tmp_1/sub/dir/c"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "touch c"
   },
   {
@@ -52,9 +48,8 @@
       "-u",
       "RECIPE_MODULE[build::zip]/resources/zip.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "zipping",
-    "stdin": "{\"entries\": [{\"path\": \"[TMP_BASE]/zip-example_tmp_1\", \"type\": \"dir\"}], \"output\": \"[TMP_BASE]/zip-example_tmp_1/output.zip\", \"root\": \"[TMP_BASE]/zip-example_tmp_1\"}"
+    "stdin": "{\"entries\": [{\"path\": \"[TMP]/zip-example_tmp_1\", \"type\": \"dir\"}], \"output\": \"[TMP]/zip-example_tmp_1/output.zip\", \"root\": \"[TMP]/zip-example_tmp_1\"}"
   },
   {
     "cmd": [
@@ -62,16 +57,14 @@
       "-u",
       "RECIPE_MODULE[build::zip]/resources/zip.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "zipping more",
-    "stdin": "{\"entries\": [{\"archive_name\": null, \"path\": \"[TMP_BASE]/zip-example_tmp_1/a\", \"type\": \"file\"}, {\"archive_name\": null, \"path\": \"[TMP_BASE]/zip-example_tmp_1/b\", \"type\": \"file\"}, {\"path\": \"[TMP_BASE]/zip-example_tmp_1/sub\", \"type\": \"dir\"}], \"output\": \"[TMP_BASE]/zip-example_tmp_1/more.zip\", \"root\": \"[TMP_BASE]/zip-example_tmp_1\"}"
+    "stdin": "{\"entries\": [{\"archive_name\": null, \"path\": \"[TMP]/zip-example_tmp_1/a\", \"type\": \"file\"}, {\"archive_name\": null, \"path\": \"[TMP]/zip-example_tmp_1/b\", \"type\": \"file\"}, {\"path\": \"[TMP]/zip-example_tmp_1/sub\", \"type\": \"dir\"}], \"output\": \"[TMP]/zip-example_tmp_1/more.zip\", \"root\": \"[TMP]/zip-example_tmp_1\"}"
   },
   {
     "cmd": [
       "echo",
-      "[TMP_BASE]/zip-example_tmp_1/more.zip"
+      "[TMP]/zip-example_tmp_1/more.zip"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "report"
   },
   {
@@ -80,15 +73,14 @@
       "-u",
       "RECIPE_MODULE[build::zip]/resources/unzip.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "unzipping",
-    "stdin": "{\"output\": \"[TMP_BASE]/zip-example_tmp_1/output\", \"zip_file\": \"[TMP_BASE]/zip-example_tmp_1/output.zip\"}"
+    "stdin": "{\"output\": \"[TMP]/zip-example_tmp_1/output\", \"zip_file\": \"[TMP]/zip-example_tmp_1/output.zip\"}"
   },
   {
     "cmd": [
       "find"
     ],
-    "cwd": "[TMP_BASE]/zip-example_tmp_1/output",
+    "cwd": "[TMP]/zip-example_tmp_1/output",
     "name": "listing"
   },
   {
@@ -96,9 +88,8 @@
       "python",
       "-u",
       "\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",
-      "[TMP_BASE]/zip-example_tmp_1"
+      "[TMP]/zip-example_tmp_1"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree cleanup",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",