Separate target for sign-in EG2 tests.

This CL is a follow-up to CL http://crrev/c/2033252 and it extracts the
sign-in EarlGrey2 tests to a separate test module. It also re-enables
the tests.

Bug: 1045478
Change-Id: Ifff26f5a4821a086d5722c168152a80aafc61cf2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2035992Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738327}

ios/build/bots/tests/eg2_tests.json

@@ -19,6 +19,10 @@
             "app": "ios_chrome_settings_eg2tests_module",
             "host": "ios_chrome_eg2tests"
         },
+        {
+            "app": "ios_chrome_signin_eg2tests_module",
+            "host": "ios_chrome_eg2tests"
+        },
         {
             "app": "ios_chrome_ui_eg2tests_module",
             "host": "ios_chrome_eg2tests",

ios/chrome/browser/ui/signin_interaction/signin_interaction_controller_egtest.mm

@@ -131,13 +131,6 @@ void ChooseImportOrKeepDataSepareteDialog(id<GREYMatcher> choiceButtonMatcher) {
 
 @implementation SigninInteractionControllerTestCase
 
-#if defined(CHROME_EARL_GREY_2)
-+ (NSArray*)testInvocations {
-  // TODO(crbug.com/1037676): Fix and enable the tests for EG2.
-  return @[];
-}
-#endif
-
 - (void)setUp {
   [super setUp];
   // Remove closed tab history to make sure the sign-in promo is always visible

ios/chrome/test/earl_grey2/BUILD.gn

@@ -15,6 +15,7 @@ group("all_tests") {
     ":ios_chrome_eg2tests",
     ":ios_chrome_integration_eg2tests_module",
     ":ios_chrome_settings_eg2tests_module",
+    ":ios_chrome_signin_eg2tests_module",
     ":ios_chrome_smoke_eg2tests_module",
     ":ios_chrome_ui_eg2tests_module",
     ":ios_chrome_web_eg2tests_module",
@@ -81,6 +82,12 @@ chrome_ios_eg2_test("ios_chrome_settings_eg2tests_module") {
   ]
 }
 
+chrome_ios_eg2_test("ios_chrome_signin_eg2tests_module") {
+  xcode_test_application_name = "ios_chrome_eg2tests"
+
+  deps = [ "//ios/chrome/browser/ui/signin_interaction:eg2_tests" ]
+}
+
 chrome_ios_eg2_test("ios_chrome_ui_eg2tests_module") {
   xcode_test_application_name = "ios_chrome_eg2tests"
 
@@ -109,7 +116,6 @@ chrome_ios_eg2_test("ios_chrome_ui_eg2tests_module") {
     "//ios/chrome/browser/ui/settings/google_services:eg2_tests",
     "//ios/chrome/browser/ui/settings/sync/utils:eg2_tests",
     "//ios/chrome/browser/ui/side_swipe:eg2_tests",
-    "//ios/chrome/browser/ui/signin_interaction:eg2_tests",
     "//ios/chrome/browser/ui/tab_grid:eg2_tests",
     "//ios/chrome/browser/ui/tabs:eg2_tests",
     "//ios/chrome/browser/ui/toolbar:eg2_tests",

testing/buildbot/chromium.fyi.json

@@ -14327,6 +14327,53 @@
         "test": "ios_chrome_settings_eg2tests_module",
         "test_target": "//ios/chrome/test/earl_grey2:ios_chrome_settings_eg2tests_module"
       },
+      {
+        "app": "ios_chrome_signin_eg2tests_module",
+        "host": "ios_chrome_eg2tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device type": "iPhone X",
+              "host os": "Mac-10.14.6",
+              "os": "13.3",
+              "pool": "chrome.tests",
+              "xcode_build_version": "11c29",
+              "xcode_parallelization": "true"
+            },
+            {
+              "device type": "iPhone 7",
+              "host os": "Mac-10.14.6",
+              "os": "13.3",
+              "pool": "chrome.tests",
+              "xcode_build_version": "11c29",
+              "xcode_parallelization": "true"
+            },
+            {
+              "device type": "iPhone X",
+              "host os": "Mac-10.14.6",
+              "os": "12.4",
+              "pool": "chrome.tests",
+              "xcode_build_version": "11c29",
+              "xcode_parallelization": "true"
+            },
+            {
+              "device type": "iPad (6th generation)",
+              "host os": "Mac-10.14.6",
+              "os": "12.4",
+              "pool": "chrome.tests",
+              "xcode_build_version": "11c29",
+              "xcode_parallelization": "true"
+            }
+          ]
+        },
+        "test": "ios_chrome_signin_eg2tests_module",
+        "test_target": "//ios/chrome/test/earl_grey2:ios_chrome_signin_eg2tests_module"
+      },
       {
         "app": "ios_chrome_smoke_eg2tests_module",
         "host": "ios_chrome_eg2tests",

testing/buildbot/gn_isolate_map.pyl

@@ -916,14 +916,14 @@
     "label": "//ios/chrome/test/earl_grey:ios_chrome_reading_list_egtests",
     "type": "raw",
   },
-  "ios_chrome_signin_egtests": {
+  "ios_chrome_settings_egtests": {
     "args": [],
-    "label": "//ios/chrome/test/earl_grey:ios_chrome_signin_egtests",
+    "label": "//ios/chrome/test/earl_grey:ios_chrome_settings_egtests",
     "type": "raw",
   },
-  "ios_chrome_settings_egtests": {
+  "ios_chrome_signin_egtests": {
     "args": [],
-    "label": "//ios/chrome/test/earl_grey:ios_chrome_settings_egtests",
+    "label": "//ios/chrome/test/earl_grey:ios_chrome_signin_egtests",
     "type": "raw",
   },
   "ios_chrome_translate_egtests": {
@@ -965,6 +965,11 @@
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_settings_eg2tests_module",
     "type": "raw",
   },
+  "ios_chrome_signin_eg2tests_module": {
+    "args": [],
+    "label": "//ios/chrome/test/earl_grey2:ios_chrome_signin_eg2tests_module",
+    "type": "raw",
+  },
   "ios_chrome_smoke_eg2tests_module": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_smoke_eg2tests_module",
@@ -975,7 +980,7 @@
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_ui_eg2tests_module",
     "type": "raw",
   },
-"ios_chrome_web_eg2tests_module": {
+  "ios_chrome_web_eg2tests_module": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_web_eg2tests_module",
     "type": "raw",

testing/buildbot/manage.py

@@ -93,8 +93,8 @@ SKIP_GN_ISOLATE_MAP_TARGETS = {
   'ios_chrome_bookmarks_egtests',
   'ios_chrome_integration_egtests',
   'ios_chrome_reading_list_egtests',
-  'ios_chrome_signin_egtests',
   'ios_chrome_settings_egtests',
+  'ios_chrome_signin_egtests',
   'ios_chrome_smoke_egtests',
   'ios_chrome_translate_egtests',
   'ios_chrome_ui_egtests',
@@ -102,6 +102,7 @@ SKIP_GN_ISOLATE_MAP_TARGETS = {
   'ios_chrome_web_egtests',
   'ios_chrome_bookmarks_eg2tests_module',
   'ios_chrome_integration_eg2tests_module',
+  'ios_chrome_signin_eg2tests_module',
   'ios_chrome_settings_eg2tests_module',
   'ios_chrome_smoke_eg2tests_module',
   'ios_showcase_eg2tests_module',

testing/buildbot/test_suites.pyl

@@ -2573,6 +2573,10 @@
         'app': 'ios_chrome_settings_eg2tests_module',
         'host': 'ios_chrome_eg2tests',
       },
+      'ios_chrome_signin_eg2tests_module': {
+        'app': 'ios_chrome_signin_eg2tests_module',
+        'host': 'ios_chrome_eg2tests',
+      },
       'ios_chrome_smoke_eg2tests_module': {
         'app': 'ios_chrome_smoke_eg2tests_module',
         'host': 'ios_chrome_eg2tests',