build: roll infra_paths changes

scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner-try-rietveld.json

Index: scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner-try-rietveld.json
diff --git a/scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner-try-rietveld.json b/scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner-try-rietveld.json
index eedd862feb6063fc88502f5e70bf172426f54dd3..e1956522262fd3e9aa376751d8956f81dfb1f939 100644
--- a/scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner-try-rietveld.json
+++ b/scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner-try-rietveld.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
+      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
       "--root",
       "build",
       "--revision_mapping_file",
       "{\"build\": \"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]"
     },
@@ -69,11 +68,10 @@
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
-      "[BUILD]/clone",
+      "[ROOT]/b/build/clone",
       "--url",
       "https://chromium.googlesource.com/chromium/tools/build"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {
@@ -84,7 +82,7 @@
       "origin",
       "master"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "git fetch"
   },
   {
@@ -94,7 +92,7 @@
       "-f",
       "FETCH_HEAD"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "git checkout"
   },
   {
@@ -103,7 +101,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -118,7 +116,7 @@
       "-d",
       "-x"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "git clean"
   },
   {
@@ -127,7 +125,7 @@
       "submodule",
       "sync"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "submodule sync"
   },
   {
@@ -138,7 +136,7 @@
       "--init",
       "--recursive"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "submodule update"
   },
   {