Remove support for old naming convention for EarlGrey tests on iOS.

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
   }
 
-  # 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
+  # TODO(crbug.com/662404): Remove when all downstream uses has been removed.
+  # If the variable is overridden, assert that it is true as all uses should
+  # have set it to true (otherwise changing the default would break things).
   if (defined(invoker.use_new_naming_convention)) {
-    _use_new_naming_convention = invoker.use_new_naming_convention
+    assert(invoker.use_new_naming_convention,
+           "use_new_naming_convention must be true if defined.")
   }
 
-  if (_use_new_naming_convention) {
-    _xctest_target = _target_name + "_module"
-    _xctest_output = _output_name + "_module"
+  _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"
-  }
+  _host_target = _target_name
+  _host_output = _output_name
 
   _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 += [ ":$_xctest_target" ]
     }
 
@@ skipping 125 matching lines @@
       "-rpath",
       "-Xlinker",
       "@loader_path/Frameworks",
     ]
   }
 }
 
 set_defaults("ios_xctest_test") {
   configs = default_executable_configs
 }