1 files changed, 34 insertions, 1 deletions
diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
index 2d60b347344..4e1e259d8bc 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
@@ -46,6 +46,14 @@ source_set("popup") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
+source_set("popup_accessibility_identifier_constants") {
+  sources = [
+    "omnibox_popup_accessibility_identifier_constants.h",
+    "omnibox_popup_accessibility_identifier_constants.mm",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("popup_ui") {
   sources = [
     "autocomplete_result_consumer.h",
@@ -74,6 +82,7 @@ source_set("popup_ui") {
     "simple_omnibox_icon.mm",
   ]
   deps = [
+    ":popup_accessibility_identifier_constants",
     "resources:omnibox_popup_tab_match",
     "//base",
     "//components/omnibox/common",
@@ -123,6 +132,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "omnibox_popup_row_cell_unittest.mm",
     "omnibox_popup_view_controller_unittest.mm",
   ]
   deps = [
@@ -144,6 +154,7 @@ source_set("eg_tests") {
     "omnibox_popup_egtest.mm",
   ]
   deps = [
+    ":popup_accessibility_identifier_constants",
     ":popup_internal",
     ":popup_ui",
     "//base",
@@ -151,7 +162,6 @@ source_set("eg_tests") {
     "//components/omnibox/browser",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
-    "//ios/chrome/browser/ui/tab_grid:egtest_support",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing/earl_grey:earl_grey_support",
@@ -160,4 +170,27 @@ source_set("eg_tests") {
   ]
   libs = [ "XCTest.framework" ]
   configs += [ "//build/config/compiler:enable_arc" ]
+  defines = [ "CHROME_EARL_GREY_1" ]
+}
+
+source_set("eg2_tests") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [
+    "omnibox_popup_egtest.mm",
+  ]
+  deps = [
+    ":popup_accessibility_identifier_constants",
+    "//base",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
+    "//ios/chrome/test/earl_grey:eg_test_support+eg2",
+    "//ios/testing/earl_grey:eg_test_support+eg2",
+    "//ios/third_party/earl_grey2:test_lib",
+    "//net:test_support",
+  ]
+  libs = [ "UIKit.framework" ]
 }