Rename XCTests test main target and output.

ios/web/shell/test/BUILD.gn

 # 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.
 
 import("//ios/build/config.gni")
 import("//ios/third_party/earl_grey/ios_eg_test.gni")
 
-ios_eg_test("ios_web_shell_test") {
+ios_eg_test("ios_web_shell_egtests") {
+  # TODO(crbug.com/662404): Remove when downstream have been changed to use
+  # the new name for the xctest app bundles.
+  use_new_naming_convention = true
+
   sources = [
     "context_menu_egtest.mm",
     "meta_tags_egtest.mm",
     "navigation_egtest.mm",
     "page_state_egtest.mm",
     "pdf_egtest.mm",
     "plugin_placeholder_egtest.mm",
     "redirect_egtest.mm",
   ]
 
@@ skipping 55 matching lines @@
     "earl_grey/shell_earl_grey.h",
     "earl_grey/shell_earl_grey.mm",
     "earl_grey/shell_matchers.h",
     "earl_grey/shell_matchers.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
 bundle_data("bundle") {
-  visibility = [ ":ios_web_shell_test_host" ]
+  visibility = [ ":ios_web_shell_egtests" ]
   sources = [
     "http_server_files/basic_navigation_test.html",
     "http_server_files/tall_page.html",
     "http_server_files/testpage.pdf",
   ]
   outputs = [
     "{{bundle_resources_dir}}/{{source_root_relative_dir}}/" +
         "{{source_file_part}}",
   ]
 }