Rename XCTests test main target and output.

build/config/ios/rules.gni

 # 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.
 
 import("//build/config/ios/ios_sdk.gni")
 import("//build/config/mac/base_rules.gni")
 import("//build/config/mac/symbols.gni")
 import("//build/toolchain/toolchain.gni")
 
 # Invokes lipo on multiple arch-specific binaries to create a fat binary.
@@ skipping 1252 matching lines @@
 # (Debug, Release, ...). In addition, the symbols visibility is configured to
 # private by default. To simplify testing with those constraints, our tests are
 # compiled in the TEST_HOST target instead of the .xctest bundle.
 template("ios_xctest_test") {
   _target_name = target_name
   _output_name = target_name
   if (defined(invoker.output_name)) {
     _output_name = invoker.output_name
   }
 
-  _xctest_target = _target_name
-  _xctest_output = _output_name
+  # TODO(crbug.com/662404): Remove when downstream have been changed to use
+  # the new name for the xctest app bundles.
+  _use_new_naming_convention = false
+  if (defined(invoker.use_new_naming_convention)) {
+    _use_new_naming_convention = invoker.use_new_naming_convention
+  }
 
-  _host_target = _target_name + "_host"
-  _host_output = _output_name + "_host"
+  if (_use_new_naming_convention) {
+    _xctest_target = _target_name + "_module"
+    _xctest_output = _output_name + "_module"
+
+    _host_target = _target_name
+    _host_output = _output_name
+  } else {
+    _xctest_target = _target_name
+    _xctest_output = _output_name
+
+    _host_target = _target_name + "_host"
+    _host_output = _output_name + "_host"
+  }
 
   _xctest_arch_loadable_module_target = _xctest_target + "_arch_loadable_module"
   _xctest_lipo_loadable_module_target = _xctest_target + "_loadable_module"
 
   loadable_module(_xctest_arch_loadable_module_target) {
     visibility = [ ":$_xctest_lipo_loadable_module_target($default_toolchain)" ]
     if (current_toolchain != default_toolchain) {
-      visibility += [ ":$_target_name" ]
+      visibility += [ ":$_xctest_target" ]
     }
 
     sources = [
       "//build/config/ios/xctest_shell.mm",
     ]
     configs += [ "//build/config/ios:xctest_config" ]
 
     output_dir = "$target_out_dir/$current_cpu"
     output_name = _xctest_output
     output_prefix_override = true
     output_extension = ""
   }
 
   if (current_toolchain != default_toolchain) {
     # For fat builds, only the default toolchain will generate a test bundle.
     # For the other toolchains, the template is only used for building the
     # arch-specific binary, thus the default target is just a group().
-    group(_target_name) {
+    group(_xctest_target) {
       forward_variables_from(invoker,
                              [
                                "visibility",
                                "testonly",
                              ])
       public_deps = [
         ":$_xctest_arch_loadable_module_target",
       ]
     }
   } else {
     _xctest_info_plist_target = _xctest_target + "_info_plist"
     _xctest_info_plist_bundle = _xctest_target + "_info_plist_bundle"
     ios_info_plist(_xctest_info_plist_target) {
       visibility = [ ":$_xctest_info_plist_bundle" ]
       info_plist = "//build/config/ios/Module-Info.plist"
-      executable_name = _output_name
+      extra_substitutions = [ "MODULE_NAME=$_xctest_output" ]
+      executable_name = _host_output
     }
 
     bundle_data(_xctest_info_plist_bundle) {
       visibility = [ ":$_xctest_target" ]
       public_deps = [
         ":$_xctest_info_plist_target",
       ]
       sources = get_target_outputs(":$_xctest_info_plist_target")
       outputs = [
         "{{bundle_root_dir}}/Info.plist",
@@ skipping 82 matching lines @@
       "-rpath",
       "-Xlinker",
       "@loader_path/Frameworks",
     ]
   }
 }
 
 set_defaults("ios_xctest_test") {
   configs = default_executable_configs
 }