Revert of Use iossim/test-without-building for Earlgrey tests.

scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json

 [
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/host_info.py",
       "--json-file",
       "/path/to/tmp/json"
     ],
     "name": "host and tools info",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br />OS X 1.2.3, Xcode 6.7.8 (5D342509a)@@@",
@@ skipping 168 matching lines @@
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"app\": \"fake tests 2\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"device type\": \"fake device\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"os\": \"7.1\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"app\": \"fake_eg_test_host\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"device type\": \"fake device 3\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"os\": \"9.3\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"xctest\": \"fake_eg_test\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"xctest\": true@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"xcode version\": \"fake xcode version\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "echo",
       "-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    \"fake env var 1\": \"fake env value 1\", \n    \"fake env var 2\": \"fake env value 2\"\n  }, \n  \"gn_args\": [], \n  \"mastername\": \"chromium.fake\", \n  \"mb_type\": null, \n  \"sdk\": \"iphonesimulator8.0\", \n  \"tests\": [\n    {\n      \"app\": \"fake tests 1\", \n      \"device type\": \"fake device\", \n      \"id\": \"0\", \n      \"os\": \"8.0\"\n    }, \n    {\n      \"app\": \"fake tests 2\", \n      \"device type\": \"fake device\", \n      \"id\": \"1\", \n      \"os\": \"7.1\"\n    }, \n    {\n      \"app\": \"fake_eg_test_host\", \n      \"device type\": \"fake device 3\", \n      \"id\": \"2\", \n      \"os\": \"9.3\", \n      \"xctest\": \"fake_eg_test\"\n    }\n  ], \n  \"triggered bots\": {}, \n  \"use_analyze\": true, \n  \"xcode version\": \"fake xcode version\"\n}"
+      "{\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    \"fake env var 1\": \"fake env value 1\", \n    \"fake env var 2\": \"fake env value 2\"\n  }, \n  \"gn_args\": [], \n  \"mastername\": \"chromium.fake\", \n  \"mb_type\": null, \n  \"sdk\": \"iphonesimulator8.0\", \n  \"tests\": [\n    {\n      \"app\": \"fake tests 1\", \n      \"device type\": \"fake device\", \n      \"id\": \"0\", \n      \"os\": \"8.0\"\n    }, \n    {\n      \"app\": \"fake tests 2\", \n      \"device type\": \"fake device\", \n      \"id\": \"1\", \n      \"os\": \"7.1\"\n    }, \n    {\n      \"app\": \"fake_eg_test_host\", \n      \"device type\": \"fake device 3\", \n      \"id\": \"2\", \n      \"os\": \"9.3\", \n      \"xctest\": true\n    }\n  ], \n  \"triggered bots\": {}, \n  \"use_analyze\": true, \n  \"xcode version\": \"fake xcode version\"\n}"
     ],
     "name": "finalize build config"
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/find_xcode.py",
       "--json-file",
       "/path/to/tmp/json",
       "--version",
       "fake xcode version"
@@ skipping 107 matching lines @@
       "@@@STEP_LINK@fake URL text@fake URL@@@"
     ]
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
       "--app",
       "[BUILDER_CACHE]/ios/src/xcodebuild/Debug-iphonesimulator/fake_eg_test_host.app",
       "--json_file",
       "/path/to/tmp/json",
-      "--xctest",
-      "[BUILDER_CACHE]/ios/src/xcodebuild/Debug-iphonesimulator/fake_eg_test_host.app/PlugIns/fake_eg_test.xctest",
+      "--test-host",
+      "fake_eg_test_host",
+      "--dummyproj",
+      "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/TestProject/TestProject.xcodeproj",
       "--iossim",
       "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim",
       "--platform",
       "fake device 3",
       "--version",
       "9.3"
     ],
     "name": "fake_eg_test_host (fake device 3 iOS 9.3)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ skipping 13 matching lines @@
       "@@@STEP_LOG_END@fake log@@@",
       "@@@STEP_LINK@fake URL text@fake URL@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]