build: roll infra_paths changes

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

Index: scripts/slave/recipes/infra/infra_repo_trybot.expected/infra_internal.json
diff --git a/scripts/slave/recipes/infra/infra_repo_trybot.expected/infra_internal.json b/scripts/slave/recipes/infra/infra_repo_trybot.expected/infra_internal.json
index c5fbee911a9fee84d6dc3f3bf8d0347c4f48a4e9..aae1165d591e977e63bb8ab1919438277a4b2ee2 100644
--- a/scripts/slave/recipes/infra/infra_repo_trybot.expected/infra_internal.json
+++ b/scripts/slave/recipes/infra/infra_repo_trybot.expected/infra_internal.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra_internal', 'url': 'https://chrome-internal.googlesource.com/infra/infra_internal.git'}]",
+      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra_internal', 'url': 'https://chrome-internal.googlesource.com/infra/infra_internal.git'}]",
       "--root",
       "infra_internal",
       "--revision_mapping_file",
       "{\"infra_internal\": \"got_revision\"}",
       "--git-cache-dir",
-      "[GIT_CACHE]",
+      "[ROOT]/b/build/slave/cache_dir",
       "--issue",
       "12853011",
       "--patchset",
@@ -25,9 +25,9 @@
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--apply_issue_email_file",
-      "[BUILD]/site_config/.rietveld_client_email",
+      "[ROOT]/b/build/site_config/.rietveld_client_email",
       "--apply_issue_key_file",
-      "[BUILD]/site_config/.rietveld_secret_key",
+      "[ROOT]/b/build/site_config/.rietveld_secret_key",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -35,7 +35,6 @@
       "--force",
       "--output_manifest"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -79,7 +78,7 @@
       "-m",
       "Committed patch"
     ],
-    "cwd": "[SLAVE_BUILD]/infra_internal",
+    "cwd": "[CWD]/infra_internal",
     "name": "commit git patch"
   },
   {
@@ -89,7 +88,6 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -103,7 +101,7 @@
       "HEAD",
       "HEAD~"
     ],
-    "cwd": "[SLAVE_BUILD]/infra_internal",
+    "cwd": "[CWD]/infra_internal",
     "name": "get change list",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -119,27 +117,25 @@
       "test.py",
       "test"
     ],
-    "cwd": "[SLAVE_BUILD]/infra_internal",
+    "cwd": "[CWD]/infra_internal",
     "name": "python tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/infra_internal/go/env.py"
+      "[CWD]/infra_internal/go/env.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "go bootstrap"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/infra_internal/go/env.py",
+      "[CWD]/infra_internal/go/env.py",
       "python",
-      "[SLAVE_BUILD]/infra_internal/go/test.py"
+      "[CWD]/infra_internal/go/test.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "go tests"
   },
   {