Revert "build: roll infra_paths changes"

scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json

Index: scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json
diff --git a/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json b/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json
index 10b7d19b90bd4bc68df3b7cc3727975e40554fbf..265883db44fe71c0c6aaaf680f5aa4df5f9e1322 100644
--- a/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json
+++ b/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json
@@ -5,6 +5,7 @@
       "--json-file",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "host and tools info",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br />OS X 1.2.3, Xcode 6.7.8 (5D342509a)@@@",
@@ -33,19 +34,20 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]\ntarget_os = ['ios', 'mac']",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]\ntarget_os = ['ios', 'mac']",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -84,6 +86,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -94,8 +97,9 @@
       "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",
-      "[CWD]/src/out_ios_arm"
+      "[SLAVE_BUILD]/src/out_ios_arm"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree out_ios_arm",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -113,8 +117,9 @@
       "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",
-      "[CWD]/src/out_ios_arm64"
+      "[SLAVE_BUILD]/src/out_ios_arm64"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree out_ios_arm64",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -132,8 +137,9 @@
       "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",
-      "[CWD]/src/out_ios_framework"
+      "[SLAVE_BUILD]/src/out_ios_framework"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree out_ios_framework",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -151,8 +157,9 @@
       "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",
-      "[CWD]/src/out_ios_ia32"
+      "[SLAVE_BUILD]/src/out_ios_ia32"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree out_ios_ia32",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -170,8 +177,9 @@
       "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",
-      "[CWD]/src/out_ios_libs"
+      "[SLAVE_BUILD]/src/out_ios_libs"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree out_ios_libs",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -189,8 +197,9 @@
       "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",
-      "[CWD]/src/out_ios_x86_64"
+      "[SLAVE_BUILD]/src/out_ios_x86_64"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree out_ios_x86_64",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -205,9 +214,9 @@
   },
   {
     "cmd": [
-      "[CWD]/src/webrtc/build/ios/build_ios_framework.sh"
+      "[SLAVE_BUILD]/src/webrtc/build/ios/build_ios_framework.sh"
     ],
-    "cwd": "[CWD]/src",
+    "cwd": "[SLAVE_BUILD]/src",
     "name": "build",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",