Revert "build: roll infra_paths changes"

scripts/slave/recipes/webrtc/ios.expected/test_failure.json

Index: scripts/slave/recipes/webrtc/ios.expected/test_failure.json
diff --git a/scripts/slave/recipes/webrtc/ios.expected/test_failure.json b/scripts/slave/recipes/webrtc/ios.expected/test_failure.json
index 374156cd18a564f0d37de8e614294e9726488151..923da3f186292aac552e5d1a1b67facbfc2efbd2 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/test_failure.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/test_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,13 +34,13 @@
       "--slave",
       "fake-vm",
       "--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]",
       "--patch_url",
       "patch url",
       "--output_json",
@@ -48,6 +49,7 @@
       "src@HEAD",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -65,9 +67,10 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]/src/webrtc/build/ios/chromium.fake/ios.json",
+      "[SLAVE_BUILD]/src/webrtc/build/ios/chromium.fake/ios.json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "read build config",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -101,6 +104,7 @@
       "-e",
       "{\n  \"GYP_DEFINES\": {\n    \"OS\": \"ios\", \n    \"component\": \"static_library\", \n    \"fake gyp define 1\": \"fake value 1\", \n    \"fake gyp define 2\": \"fake value 2\"\n  }, \n  \"additional_compile_targets\": [\n    \"All\"\n  ], \n  \"compiler\": \"xcodebuild\", \n  \"configuration\": \"Debug\", \n  \"env\": {}, \n  \"gn_args\": [], \n  \"mb_type\": null, \n  \"sdk\": \"iphonesimulator8.0\", \n  \"tests\": [\n    {\n      \"app\": \"fake tests 1\", \n      \"device type\": \"fake device\", \n      \"os\": \"8.0\"\n    }, \n    {\n      \"app\": \"fake tests 2\", \n      \"device type\": \"fake device\", \n      \"os\": \"7.1\"\n    }\n  ], \n  \"triggered bots\": {}, \n  \"use_analyze\": true, \n  \"xcode version\": \"fake xcode version\"\n}"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "finalize build config"
   },
   {
@@ -111,6 +115,7 @@
       "--version",
       "fake xcode version"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "find xcode",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -124,6 +129,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GYP_DEFINES": "fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios",
       "GYP_GENERATORS": "xcode",
@@ -142,27 +148,28 @@
       "-configuration",
       "Debug",
       "-project",
-      "[CWD]/src/build/all.xcodeproj",
+      "[SLAVE_BUILD]/src/build/all.xcodeproj",
       "-sdk",
       "iphonesimulator8.0"
     ],
-    "cwd": "[CWD]/src/xcodebuild",
+    "cwd": "[SLAVE_BUILD]/src/xcodebuild",
     "name": "compile"
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
       "--app",
-      "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake tests 1.app",
+      "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake tests 1.app",
       "--json_file",
       "/path/to/tmp/json",
       "--iossim",
-      "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim",
+      "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim",
       "--platform",
       "fake device",
       "--version",
       "8.0"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "fake tests 1 (fake device iOS 8.0)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
@@ -189,16 +196,17 @@
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
       "--app",
-      "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake tests 2.app",
+      "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake tests 2.app",
       "--json_file",
       "/path/to/tmp/json",
       "--iossim",
-      "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim",
+      "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim",
       "--platform",
       "fake device",
       "--version",
       "7.1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "fake tests 2 (fake device iOS 7.1)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",