build: roll infra_paths changes

scripts/slave/recipe_modules/file/example.expected/file_io.json

Index: scripts/slave/recipe_modules/file/example.expected/file_io.json
diff --git a/scripts/slave/recipe_modules/file/example.expected/file_io.json b/scripts/slave/recipe_modules/file/example.expected/file_io.json
index 58285309e94d3c5ab87a327f0990b88dacac0a08..5d6c765a20ad367cc99a561e5320bfc70212ead2 100644
--- a/scripts/slave/recipe_modules/file/example.expected/file_io.json
+++ b/scripts/slave/recipe_modules/file/example.expected/file_io.json
@@ -7,7 +7,6 @@
       "/fake/dir",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "listdir fake dir",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@[@@@",
@@ -28,7 +27,6 @@
       "some",
       "command"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "manipulate file 1"
   },
   {
@@ -36,23 +34,20 @@
       "some",
       "command"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "manipulate file 2"
   },
   {
     "cmd": [
       "echo",
-      "[TMP_BASE]/prefix_a_tmp_1"
+      "[TMP]/prefix_a_tmp_1"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "print prefix_a"
   },
   {
     "cmd": [
       "echo",
-      "[TMP_BASE]/prefix_b_tmp_2"
+      "[TMP]/prefix_b_tmp_2"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "print prefix_b"
   },
   {
@@ -61,10 +56,9 @@
       "-u",
       "\nimport sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\nchromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])\n",
       "*.o",
-      "[SLAVE_BUILD]"
+      "[CWD]"
     ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "rmwildcard *.o in [SLAVE_BUILD]",
+    "name": "rmwildcard *.o in [CWD]",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
@@ -82,7 +76,6 @@
       "abcde",
       "tmp_file.txt"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "write_simple"
   },
   {
@@ -93,7 +86,6 @@
       "tmp_file.txt",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "read_simple"
   },
   {
@@ -104,7 +96,6 @@
       "! ~&&",
       "tmp_file.txt"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "write_symbols"
   },
   {
@@ -115,7 +106,6 @@
       "tmp_file.txt",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "read_symbols"
   },
   {
@@ -126,7 +116,6 @@
       "abcde fgh",
       "tmp_file.txt"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "write_spaces"
   },
   {
@@ -137,7 +126,6 @@
       "tmp_file.txt",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "read_spaces"
   },
   {
@@ -148,7 +136,6 @@
       "ab\ncd\nefg\n",
       "tmp_file.txt"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "write_multiline"
   },
   {
@@ -159,7 +146,6 @@
       "tmp_file.txt",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "read_multiline"
   },
   {
@@ -167,10 +153,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",
-      "[SLAVE_BUILD]/copytree_example_tmp",
+      "[CWD]/copytree_example_tmp",
       "511"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs makedirs",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -191,21 +176,19 @@
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "some file content",
-      "[SLAVE_BUILD]/copytree_example_tmp/dummy_file"
+      "[CWD]/copytree_example_tmp/dummy_file"
     ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "write [SLAVE_BUILD]/copytree_example_tmp/dummy_file"
+    "name": "write [CWD]/copytree_example_tmp/dummy_file"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
-      "[SLAVE_BUILD]/copytree_example_tmp",
-      "[SLAVE_BUILD]/copytree_example_tmp2",
+      "[CWD]/copytree_example_tmp",
+      "[CWD]/copytree_example_tmp2",
       "0"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "copytree"
   },
   {
@@ -213,11 +196,10 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/copytree_example_tmp2/dummy_file",
+      "[CWD]/copytree_example_tmp2/dummy_file",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "read [SLAVE_BUILD]/copytree_example_tmp2/dummy_file"
+    "name": "read [CWD]/copytree_example_tmp2/dummy_file"
   },
   {
     "cmd": [
@@ -225,9 +207,8 @@
       "-u",
       "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n  f.write('\\n'.join(glob.glob(sys.argv[2])))\n",
       "/path/to/tmp/",
-      "[SLAVE_BUILD]/copytree_example_tmp/*"
+      "[CWD]/copytree_example_tmp/*"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "glob"
   },
   {
@@ -235,9 +216,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",
-      "[SLAVE_BUILD]/copytree_example_tmp"
+      "[CWD]/copytree_example_tmp"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree cleanup",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -255,9 +235,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",
-      "[SLAVE_BUILD]/copytree_example_tmp2"
+      "[CWD]/copytree_example_tmp2"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree cleanup2",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",