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

scripts/slave/ios/run.py

 #!/usr/bin/python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Run an iOS GTest app.
 
 Sample usage:
   ./run.py \
   -a src/xcodebuild/Release-iphoneos/base_unittests.app \
@@ skipping 14 matching lines @@
 # pylint: disable=relative-import
 from test_runner import SimulatorTestRunner, SimulatorXCTestRunner, \
   TestRunnerError
 
 
 def main(args, test_args):
   summary = {}
   test_runner = None
 
   try:
-    if args.xctest:
+    if args.test_host:
       test_runner = SimulatorXCTestRunner(
         args.app,
-        args.xctest,
-        args.iossim,
+        args.test_host,
+        args.dummyproj,
         args.platform,
         args.version,
         env_vars=args.env_var,
         gs_bucket=args.bucket,
         test_args=test_args,
         xcode_version=args.xcode_version,
       )
     else:
       test_runner = SimulatorTestRunner(
         args.app,
@@ skipping 36 matching lines @@
     type=str,
   )
   parser.add_argument(
     '-b',
     '--bucket',
     help='Google Storage bucket to upload test data to.',
     metavar='path',
     type=str,
   )
   parser.add_argument(
+    '-d',
+    '--dummyproj',
+    help='Dummy test project path.',
+    metavar='.xcodeproj',
+    type=str,
+  )
+  parser.add_argument(
     '-e',
     '--env-var',
     action='append',
     help='Environment variable to pass to the test itself.',
     metavar='ENV=val',
     type=str,
   )
   parser.add_argument(
     '-i',
     '--iossim',
@@ skipping 10 matching lines @@
   )
   parser.add_argument(
     '-p',
     '--platform',
     help='Platform to simulate.',
     metavar='sim',
     required=True,
     type=str,
   )
   parser.add_argument(
+    '-t',
+    '--test-host',
+    help='Compiled test host to run tests.',
+    metavar='host',
+    type=str,
+  )
+  parser.add_argument(
     '-v',
     '--version',
     help='Version of iOS the simulator should run.',
     metavar='ver',
     required=True,
     type=str,
   )
   parser.add_argument(
     '-x',
     '--xcode-version',
     help='Version of Xcode to use.',
     metavar='ver',
     type=str,
   )
-  parser.add_argument(
-    '--xctest',
-    help='Compiled xctest to run.',
-    metavar='xctest',
-    type=str,
-  )
-
   sys.exit(main(*parser.parse_known_args()))