Reland "[iOS] Remove all EG1 test targets and related GN components."

This is a reland of 6a309aa Original change's description: > [iOS] Remove all EG1 test targets and related GN components. > > Removed all test targets, EG1 specific test utils in GN files. > Removed gni files to build EG1 targets. > Removed build files in ios/third_party/earl_grey. > > Bug: 1046369 > Change-Id: Iec1d60fa40d10969c4e6e6840f2983b02c3170dc > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2275353 > Commit-Queue: Zhaoyang Li <[email protected]> > Reviewed-by: Rohit Rao <[email protected]> > Cr-Commit-Position: refs/heads/master@{#784204} Bug: 1046369 Change-Id: I1690dcd79d4848cf042c06cfe2b479ed37b2df17 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2276682 Reviewed-by: Rohit Rao <[email protected]> Commit-Queue: Rohit Rao <[email protected]> Commit-Queue: Zhaoyang Li <[email protected]> Cr-Commit-Position: refs/heads/master@{#784293}
hadissulejmani · Jul 1, 2020 · cf491d9 · cf491d9
1 parent 36a8065
commit cf491d9
Show file tree

Hide file tree

Showing 73 changed files with 4 additions and 3,335 deletions.
diff --git a/ios/DEPS b/ios/DEPS
@@ -6,7 +6,7 @@ include_rules = [
   # To avoid ODR violation, direct import of these libraries is forbidden in
   # ios/DEPS and code should instead use import as if they were in a framework
   # (i.e. #import <OCHamcrest/OCHamcrest.h>).
-  "-ios/third_party/earl_grey",
+  # TODO(crbug.com/1101077): Disallow direct import of eg2 headers.
   "-ios/third_party/ochamcrest",
 
   # For unit tests.

diff --git a/ios/chrome/browser/autofill/BUILD.gn b/ios/chrome/browser/autofill/BUILD.gn
@@ -521,31 +521,6 @@ bundle_data("unit_tests_bundle_data") {
               "{{source_root_relative_dir}}/{{source_file_part}}" ]
 }
 
-source_set("eg_tests") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [ "form_input_egtest.mm" ]
-  deps = [
-    ":autofill",
-    "//base",
-    "//base/test:test_support",
-    "//components/autofill/ios/browser:browser",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/autofill:autofill_shared",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/test:eg_test_support",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/testing/earl_grey:earl_grey_support",
-    "//ios/third_party/earl_grey:earl_grey+link",
-    "//ios/web:earl_grey_test_support",
-    "//ios/web/public/deprecated",
-    "//ios/web/public/test:element_selector",
-    "//ios/web/public/test/http_server",
-  ]
-}
-
 source_set("eg2_tests") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [

diff --git a/ios/chrome/browser/autofill/automation/BUILD.gn b/ios/chrome/browser/autofill/automation/BUILD.gn
@@ -2,39 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("eg_tests") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "automation_action.h",
-    "automation_action.mm",
-    "automation_action_egtest.mm",
-    "automation_app_interface.h",
-    "automation_app_interface.mm",
-    "automation_egtest.mm",
-  ]
-  deps = [
-    "//base",
-    "//components/autofill/core/browser",
-    "//components/autofill/ios/browser",
-    "//components/autofill/ios/browser:autofill_test_bundle_data",
-    "//components/strings",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/autofill",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/ui/infobars:constants",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/testing/earl_grey:earl_grey_support",
-    "//ios/web/public/js_messaging",
-    "//ios/web/public/test:element_selector",
-    "//ios/web/public/test/http_server:http_server",
-    "//net:test_support",
-  ]
-  libs = [ "XCTest.framework" ]
-}
-
 source_set("eg2_tests") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [

diff --git a/ios/chrome/browser/context_menu/BUILD.gn b/ios/chrome/browser/context_menu/BUILD.gn
@@ -2,30 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("eg_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  defines = [ "CHROME_EARL_GREY_1" ]
-  testonly = true
-  sources = [ "context_menu_egtest.mm" ]
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//components/strings",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui/fullscreen/test:eg_test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/testing/earl_grey:earl_grey_support",
-    "//ios/third_party/earl_grey:earl_grey+link",
-    "//ios/web/public/test:element_selector",
-    "//net:test_support",
-    "//url",
-  ]
-  libs = [
-    "UIKit.framework",
-    "XCTest.framework",
-  ]
-}
-
 source_set("eg2_tests") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [

diff --git a/ios/chrome/browser/device_sharing/BUILD.gn b/ios/chrome/browser/device_sharing/BUILD.gn
@@ -50,21 +50,6 @@ source_set("unit_tests") {
   ]
 }
 
-source_set("test_support") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "handoff_manager_app_interface.h",
-    "handoff_manager_app_interface.mm",
-  ]
-  deps = [
-    ":device_sharing",
-    "//components/handoff",
-    "//ios/chrome/test/app:test_support",
-  ]
-}
-
 source_set("eg_app_support+eg2") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [
@@ -94,24 +79,6 @@ source_set("eg_test_support+eg2") {
   sources = [ "handoff_manager_app_interface.h" ]
 }
 
-source_set("eg_tests") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [ "handoff_manager_egtest.mm" ]
-  deps = [
-    ":test_support",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/testing/earl_grey:earl_grey_support",
-    "//ios/third_party/earl_grey:earl_grey+link",
-    "//ios/web/public/test/http_server",
-    "//net",
-    "//url",
-  ]
-  libs = [ "XCTest.framework" ]
-}
-
 source_set("eg2_tests") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [

diff --git a/ios/chrome/browser/feature_engagement/BUILD.gn b/ios/chrome/browser/feature_engagement/BUILD.gn
@@ -27,55 +27,6 @@ source_set("feature_engagement") {
   ]
 }
 
-source_set("eg_test_support") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "feature_engagement_app_interface.h",
-    "feature_engagement_app_interface.mm",
-  ]
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//components/feature_engagement/public",
-    "//components/feature_engagement/test:test_support",
-    "//components/keyed_service/core",
-    "//components/translate/core/browser",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/feature_engagement",
-    "//ios/chrome/test/app:test_support",
-  ]
-}
-
-source_set("eg_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  defines = [ "CHROME_EARL_GREY_1" ]
-  testonly = true
-  sources = [ "feature_engagement_egtest.mm" ]
-  deps = [
-    ":eg_test_support",
-    ":feature_engagement",
-    "//base",
-    "//base/test:test_support",
-    "//components/feature_engagement/public",
-    "//components/feature_engagement/test:test_support",
-    "//components/translate/core/browser",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/ui/popup_menu:constants",
-    "//ios/chrome/browser/ui/table_view:constants",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/testing/earl_grey:earl_grey_support",
-    "//net:test_support",
-    "//ui/base",
-    "//url",
-  ]
-}
-
 source_set("eg_app_support+eg2") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [

diff --git a/ios/chrome/browser/metrics/BUILD.gn b/ios/chrome/browser/metrics/BUILD.gn
@@ -224,62 +224,6 @@ source_set("unit_tests_internal") {
   ]
 }
 
-source_set("eg_tests") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "demographics_egtest.mm",
-    "tab_usage_recorder_egtest.mm",
-    "ukm_egtest.mm",
-  ]
-  deps = [
-    ":metrics_internal",
-    ":tab_usage_recorder_metrics",
-    ":test_support",
-    "//base",
-    "//base/test:test_support",
-    "//components/browser_sync",
-    "//components/metrics",
-    "//components/metrics:demographic_metrics_provider",
-    "//components/metrics_services_manager",
-    "//components/strings",
-    "//components/sync/base",
-    "//components/ukm",
-    "//components/ukm:test_support",
-    "//components/unified_consent:unified_consent",
-    "//ios/chrome/app/strings:ios_strings_grit",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/metrics",
-    "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/sync",
-    "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/browser/ui/authentication:eg_test_support",
-    "//ios/chrome/browser/ui/authentication/cells",
-    "//ios/chrome/browser/ui/popup_menu:constants",
-    "//ios/chrome/browser/ui/settings",
-    "//ios/chrome/browser/ui/settings/google_services",
-    "//ios/chrome/browser/ui/toolbar/buttons",
-    "//ios/chrome/browser/ui/toolbar/public",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/test:eg_test_support",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
-    "//ios/public/provider/chrome/browser/signin:test_support",
-    "//ios/testing/earl_grey:earl_grey_support",
-    "//ios/web:earl_grey_test_support",
-    "//ios/web/public/test",
-    "//ios/web/public/test:element_selector",
-    "//ios/web/public/test/http_server",
-    "//net:test_support",
-    "//third_party/metrics_proto",
-    "//ui/base",
-    "//url",
-  ]
-  libs = [ "XCTest.framework" ]
-}
-
 source_set("eg2_tests") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [
@@ -313,45 +257,6 @@ source_set("eg2_tests") {
   libs = [ "UIKit.framework" ]
 }
 
-source_set("test_support") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  testonly = true
-  sources = [
-    "metrics_app_interface.h",
-    "metrics_app_interface.mm",
-  ]
-  deps = [
-    ":metrics",
-    "//base",
-    "//base/test:test_support",
-    "//components/metrics",
-    "//components/metrics:demographics_test_support",
-    "//components/metrics_services_manager",
-    "//components/network_time",
-    "//components/prefs",
-    "//components/ukm",
-    "//components/ukm:ukm_test_helper",
-    "//ios/chrome/app:app_internal",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/metrics:metrics_internal",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/main",
-    "//ios/chrome/browser/ui/popup_menu:constants",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/test:eg_test_support",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/testing/earl_grey:earl_grey_support",
-    "//net:test_support",
-    "//third_party/metrics_proto",
-    "//ui/base",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 import("//components/metrics/generate_expired_histograms_array.gni")
 
 generate_expired_histograms_array("expired_histograms_array") {

diff --git a/ios/chrome/browser/net/BUILD.gn b/ios/chrome/browser/net/BUILD.gn
@@ -72,24 +72,6 @@ source_set("unit_tests") {
   ]
 }
 
-source_set("eg_tests") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [ "cookies_egtest.mm" ]
-  deps = [
-    "//base",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/testing/earl_grey:earl_grey_support",
-    "//ios/third_party/earl_grey:earl_grey+link",
-    "//ios/web/public/test",
-    "//ios/web/public/test/http_server",
-    "//url",
-  ]
-  libs = [ "XCTest.framework" ]
-}
-
 source_set("eg2_tests") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [

diff --git a/ios/chrome/browser/ntp_tiles/BUILD.gn b/ios/chrome/browser/ntp_tiles/BUILD.gn
@@ -48,19 +48,3 @@ source_set("eg2_tests") {
   ]
   libs = [ "UIKit.framework" ]
 }
-
-source_set("eg_tests") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  testonly = true
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [ "ntp_tiles_egtest.mm" ]
-  deps = [
-    ":ntp_tiles",
-    "//base/test:test_support",
-    "//components/ntp_tiles:ntp_tiles",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/testing/earl_grey:earl_grey_support",
-    "//ios/web/public/test/http_server:http_server",
-  ]
-}