build: roll infra_paths changes

scripts/slave/recipes/infra/infra_repo_trybot.expected/rietveld_tests_on_win.json

Index: scripts/slave/recipes/infra/infra_repo_trybot.expected/rietveld_tests_on_win.json
diff --git a/scripts/slave/recipes/infra/infra_repo_trybot.expected/rietveld_tests_on_win.json b/scripts/slave/recipes/infra/infra_repo_trybot.expected/rietveld_tests_on_win.json
index 138792a41f7204033e8826b1c29a1e1359a617c7..c870ee2c4427c2ef00d84744c50af357c471a38c 100644
--- a/scripts/slave/recipes/infra/infra_repo_trybot.expected/rietveld_tests_on_win.json
+++ b/scripts/slave/recipes/infra/infra_repo_trybot.expected/rietveld_tests_on_win.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
+      "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
       "--root",
       "infra",
       "--revision_mapping_file",
       "{\"infra\": \"got_revision\"}",
       "--git-cache-dir",
-      "[GIT_CACHE]",
+      "[ROOT]\\b\\build\\slave\\cache_dir",
       "--issue",
       "12853011",
       "--patchset",
@@ -31,7 +31,6 @@
       "--force",
       "--output_manifest"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -82,7 +81,7 @@
       "-m",
       "Committed patch"
     ],
-    "cwd": "[SLAVE_BUILD]\\infra",
+    "cwd": "[CWD]\\infra",
     "name": "commit git patch"
   },
   {
@@ -92,7 +91,6 @@
       "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -106,7 +104,7 @@
       "HEAD",
       "HEAD~"
     ],
-    "cwd": "[SLAVE_BUILD]\\infra",
+    "cwd": "[CWD]\\infra",
     "name": "get change list",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -121,27 +119,25 @@
       "test.py",
       "test"
     ],
-    "cwd": "[SLAVE_BUILD]\\infra",
+    "cwd": "[CWD]\\infra",
     "name": "python tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]\\infra\\go\\env.py"
+      "[CWD]\\infra\\go\\env.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "go bootstrap"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]\\infra\\go\\env.py",
+      "[CWD]\\infra\\go\\env.py",
       "python",
-      "[SLAVE_BUILD]\\infra\\go\\test.py"
+      "[CWD]\\infra\\go\\test.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "go tests"
   },
   {