Move some tests out of ios_chrome_ui_eg2tests

Bug: 1015953
Change-Id: I6e08a727f800b7f0d0cedf40acdaa1669d829030
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1900066Reviewed-by: Justin Cohen <justincohen@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
Auto-Submit: Lindsay Pasricha <lindsayw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713506}

ios/chrome/test/earl_grey/BUILD.gn

@@ -34,7 +34,9 @@ chrome_ios_eg_test("ios_chrome_integration_egtests") {
     "//ios/chrome/browser/ntp_tiles:eg_tests",
     "//ios/chrome/browser/passwords:eg_tests",
     "//ios/chrome/browser/prerender:eg_tests",
+    "//ios/chrome/browser/ui/autofill:eg_tests",
     "//ios/chrome/browser/ui/autofill/manual_fill:eg_tests",
+    "//ios/chrome/browser/ui/content_suggestions:eg_tests",
     "//ios/chrome/browser/ui/payments:eg_tests",
   ]
 }
@@ -73,9 +75,7 @@ chrome_ios_eg_test("ios_chrome_ui_egtests") {
   deps = [
     "//ios/chrome/browser/ui/activity_services:eg_tests",
     "//ios/chrome/browser/ui/alert_coordinator:eg_tests",
-    "//ios/chrome/browser/ui/autofill:eg_tests",
     "//ios/chrome/browser/ui/browser_view:eg_tests",
-    "//ios/chrome/browser/ui/content_suggestions:eg_tests",
     "//ios/chrome/browser/ui/dialogs:eg_tests",
     "//ios/chrome/browser/ui/download:eg_tests",
     "//ios/chrome/browser/ui/find_bar:eg_tests",

ios/chrome/test/earl_grey2/BUILD.gn

@@ -41,6 +41,10 @@ chrome_ios_eg2_test("ios_chrome_integration_eg2tests_module") {
     "//ios/chrome/browser/ntp_tiles:eg2_tests",
     "//ios/chrome/browser/passwords:eg2_tests",
     "//ios/chrome/browser/prerender:eg2_tests",
+    "//ios/chrome/browser/ui/autofill:eg2_tests",
+    "//ios/chrome/browser/ui/autofill/manual_fill:eg2_tests",
+    "//ios/chrome/browser/ui/content_suggestions:eg2_tests",
+    "//ios/chrome/browser/ui/integration_tests:eg2_tests",
   ]
 }
 
@@ -66,14 +70,10 @@ chrome_ios_eg2_test("ios_chrome_ui_eg2tests_module") {
 
   deps = [
     "//ios/chrome/browser/ui/activity_services:eg2_tests",
-    "//ios/chrome/browser/ui/autofill:eg2_tests",
-    "//ios/chrome/browser/ui/autofill/manual_fill:eg2_tests",
-    "//ios/chrome/browser/ui/content_suggestions:eg2_tests",
     "//ios/chrome/browser/ui/dialogs:eg2_tests",
     "//ios/chrome/browser/ui/download:eg2_tests",
     "//ios/chrome/browser/ui/first_run:eg2_tests",
     "//ios/chrome/browser/ui/fullscreen:eg2_tests",
-    "//ios/chrome/browser/ui/integration_tests:eg2_tests",
     "//ios/chrome/browser/ui/keyboard:eg2_tests",
     "//ios/chrome/browser/ui/ntp:eg2_tests",
     "//ios/chrome/browser/ui/omnibox/popup:eg2_tests",