Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/ios/example.expected/basic.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "chromium.fake",
       "--builder",
       "ios",
       "--slave",
       "fake-vm",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['ios']",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['ios']",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
@@ skipping 56 matching lines @@
       "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]/src/ios/build/bots/chromium.fake/ios.json",
+      "[SLAVE_BUILD]/src/ios/build/bots/chromium.fake/ios.json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "read build config",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"GYP_DEFINES\": {}, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"compiler\": \"xcodebuild\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"configuration\": \"Debug\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"sdk\": \"iphonesimulator8.1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"app\": \"fake test 1\", @@@",
@@ skipping 19 matching lines @@
       "@@@STEP_LOG_LINE@json.output@  \"xcode version\": \"6.1.1\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]/src/ios/build/bots/tests/fake include.json",
+      "[SLAVE_BUILD]/src/ios/build/bots/tests/fake include.json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "include fake include.json",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"app\": \"fake included test 1\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"app\": \"fake included test 2\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  ]@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "echo",
       "-e",
       "{\n  \"GYP_DEFINES\": {\n    \"OS\": \"ios\", \n    \"component\": \"static_library\"\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.1\", \n  \"tests\": [\n    {\n      \"app\": \"fake test 1\", \n      \"device type\": \"fake device 1\", \n      \"os\": \"8.1\"\n    }, \n    {\n      \"app\": \"fake included test 1\", \n      \"device type\": \"fake device 1\", \n      \"os\": \"8.1\"\n    }, \n    {\n      \"app\": \"fake included test 2\", \n      \"device type\": \"fake device 1\", \n      \"os\": \"8.1\"\n    }, \n    {\n      \"app\": \"fake test 2\", \n      \"device type\": \"fake device 2\", \n      \"os\": \"7.1\"\n    }, \n    {\n      \"app\": \"fake included test 1\", \n      \"device type\": \"fake device 2\", \n      \"os\": \"7.1\"\n    }, \n    {\n      \"app\": \"fake included test 2\", \n      \"device type\": \"fake device 2\", \n      \"os\": \"7.1\"\n    }\n  ], \n  \"triggered bots\": {}, \n  \"use_analyze\": true, \n  \"xcode version\": \"6.1.1\"\n}"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "finalize build config"
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/find_xcode.py",
       "--json-file",
       "/path/to/tmp/json",
       "--version",
       "6.1.1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "find xcode",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GYP_DEFINES": "component=static_library OS=ios",
       "GYP_GENERATORS": "xcode",
       "GYP_GENERATOR_FLAGS": "xcode_project_version=3.2",
       "LANDMINES_VERBOSE": "1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br />GYP_DEFINES:<br />component=static_library<br />OS=ios@@@"
     ]
   },
   {
     "cmd": [
       "xcodebuild",
       "-configuration",
       "Debug",
       "-project",
-      "[CWD]/src/build/all.xcodeproj",
+      "[SLAVE_BUILD]/src/build/all.xcodeproj",
       "-sdk",
       "iphonesimulator8.1"
     ],
-    "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 test 1.app",
+      "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake test 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 1",
       "--version",
       "8.1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "fake test 1 (fake device 1 iOS 8.1)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"links\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake URL text\": \"fake URL\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"logs\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake log\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 1\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 2\"@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 1@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 2@@@",
       "@@@STEP_LOG_END@fake log@@@",
       "@@@STEP_LINK@fake URL text@fake URL@@@"
     ]
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
       "--app",
-      "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake included test 1.app",
+      "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake included test 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 1",
       "--version",
       "8.1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "fake included test 1 (fake device 1 iOS 8.1)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"links\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake URL text\": \"fake URL\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"logs\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake log\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 1\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 2\"@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 1@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 2@@@",
       "@@@STEP_LOG_END@fake log@@@",
       "@@@STEP_LINK@fake URL text@fake URL@@@"
     ]
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
       "--app",
-      "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake included test 2.app",
+      "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake included test 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 1",
       "--version",
       "8.1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "fake included test 2 (fake device 1 iOS 8.1)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"links\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake URL text\": \"fake URL\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"logs\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake log\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 1\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 2\"@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 1@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 2@@@",
       "@@@STEP_LOG_END@fake log@@@",
       "@@@STEP_LINK@fake URL text@fake URL@@@"
     ]
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
       "--app",
-      "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake test 2.app",
+      "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake test 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 2",
       "--version",
       "7.1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "fake test 2 (fake device 2 iOS 7.1)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"links\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake URL text\": \"fake URL\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"logs\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake log\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 1\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 2\"@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 1@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 2@@@",
       "@@@STEP_LOG_END@fake log@@@",
       "@@@STEP_LINK@fake URL text@fake URL@@@"
     ]
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
       "--app",
-      "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake included test 1.app",
+      "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake included test 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 2",
       "--version",
       "7.1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "fake included test 1 (fake device 2 iOS 7.1)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"links\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake URL text\": \"fake URL\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"logs\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake log\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 1\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 2\"@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 1@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 2@@@",
       "@@@STEP_LOG_END@fake log@@@",
       "@@@STEP_LINK@fake URL text@fake URL@@@"
     ]
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
       "--app",
-      "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake included test 2.app",
+      "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake included test 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 2",
       "--version",
       "7.1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "fake included test 2 (fake device 2 iOS 7.1)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"links\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake URL text\": \"fake URL\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"logs\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake log\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 1\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"fake log line 2\"@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 1@@@",
       "@@@STEP_LOG_LINE@fake log@fake log line 2@@@",
       "@@@STEP_LOG_END@fake log@@@",
       "@@@STEP_LINK@fake URL text@fake URL@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]