Rename XCTests test main target and output.

ios/build/bots/scripts/test_runner.py

 # Copyright 2016 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.
 
 """Test runners for iOS."""
 
 import argparse
 import collections
 import errno
 import os
@@ skipping 664 matching lines @@
 
   def get_launch_env(self):
     """Returns a dict of environment variables to use to launch the test app.
 
     Returns:
       A dict of environment variables.
     """
     env = super(DeviceTestRunner, self).get_launch_env()
     if self.xctest_path:
       env['NSUnbufferedIO'] = 'YES'
-      # e.g. ios_web_shell_test_host
-      env['APP_TARGET_NAME'] = (
-        os.path.splitext(os.path.basename(self.app_path))[0])
-      # e.g. ios_web_shell_test
-      env['TEST_TARGET_NAME'] = env['APP_TARGET_NAME'].rsplit('_', 1)[0]
+      # e.g. ios_web_shell_egtests
+      env['APP_TARGET_NAME'] = os.path.splitext(
+          os.path.basename(self.app_path))[0]
+
+      # Two convention for the test name have been in use. Old convention was to
+      # use the host name without _host suffix while the new convention is to
+      # use host name with _module suffix. As new convention does not use _host
+      # suffix its presence can be used to determine correct name for the test
+      # target. TODO(crbug.com/662404): remove once only new convention is used.
+      # e.g. ios_web_shell_egtests_module
+      if env['APP_TARGET_NAME'].endswith('_host'):
+        env['TEST_TARGET_NAME'] = env['APP_TARGET_NAME'].rsplit('_', 1)[0]
+      else:
+        env['TEST_TARGET_NAME'] = env['APP_TARGET_NAME'] + '_module'
     return env