[ios] Compiles ios/testing/earl_grey under both EG1 and EG2.

Adds new GN targets for compiling these test support files under EG2.
Rearranges ios/chrome/test/earl_grey2/BUILD.gn to clearly separate out
support libraries for the app and test processes.  Modifies the EG2
templates to automatically have EG2 app hosts and tests depend on the
appropriate support libraries.

BUG=922813

Change-Id: Iefcb72386389f2ed7339fcf9ce8edd13b28f08a2
Reviewed-on: https://chromium-review.googlesource.com/c/1418432
Commit-Queue: Rohit Rao <[email protected]>
Reviewed-by: Justin Cohen <[email protected]>
Cr-Commit-Position: refs/heads/master@{#624089}

Author: Rohit Rao

ios/chrome/test/earl_grey2/BUILD.gn

@@ -15,9 +15,6 @@ group("all_tests") {
 }
 
 chrome_ios_eg2_test_app_host("ios_chrome_eg2_test_app_host") {
-  deps = [
-    ":earl_grey2_host_distant_object_sources",
-  ]
 }
 
 chrome_ios_eg2_test("ios_chrome_smoke_eg2tests") {
@@ -28,32 +25,44 @@ chrome_ios_eg2_test("ios_chrome_smoke_eg2tests") {
   ]
 }
 
-source_set("earl_grey2_host_distant_object_headers") {
+source_set("shared_helper_headers") {
   testonly = true
   sources = [
     "//ios/chrome/test/earl_grey2/chrome_earl_grey_edo.h",
   ]
 }
 
-source_set("earl_grey2_host_distant_object_sources") {
-  configs += [ "//build/config/compiler:enable_arc" ]
+source_set("eg_app_support+eg2") {
   testonly = true
-  sources = [
-    "//ios/chrome/test/earl_grey2/chrome_earl_grey_edo.mm",
-  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
 
-  include_dirs = [
-    "//ios/third_party/earl_grey2/src",
-    "//ios/third_party/edo/src",
+  sources = [
+    "chrome_earl_grey_edo.mm",
   ]
 
   deps = [
-    ":earl_grey2_host_distant_object_headers",
     "//base",
     "//base/test:test_support",
     "//ios/chrome/test/app:test_support",
+    "//ios/testing/earl_grey:eg_app_support+eg2",
     "//ios/third_party/earl_grey2:app_framework+link",
   ]
+
+  public_deps = [
+    ":shared_helper_headers",
+  ]
+
+  include_dirs = [
+    "//ios/third_party/earl_grey2/src",
+    "//ios/third_party/edo/src",
+  ]
+}
+
+group("eg_test_support+eg2") {
+  testonly = true
+  public_deps = [
+    ":shared_helper_headers",
+  ]
 }
 
 source_set("eg2_tests") {
@@ -70,7 +79,7 @@ source_set("eg2_tests") {
   include_dirs = [ "//ios/third_party/edo/src" ]
 
   deps = [
-    "//ios/chrome/test/earl_grey2:earl_grey2_host_distant_object_headers",
+    ":eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
   ]
 

ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni

@@ -90,6 +90,7 @@ template("chrome_ios_eg2_test_app_host") {
       ":$_deps_group_name",
       "//ios/chrome/app:main",
       "//ios/chrome/test/earl_grey:hooks",
+      "//ios/chrome/test/earl_grey2:eg_app_support+eg2",
       "//ios/testing:http_server_bundle_data",
       "//ios/third_party/earl_grey2:app_framework+link",
     ]
@@ -145,6 +146,11 @@ template("chrome_ios_eg2_test") {
                              "xcode_test_application_name",
                              "deps",
                            ])
+
+    if (!defined(deps)) {
+      deps = []
+    }
+    deps += [ "//ios/chrome/test/earl_grey2:eg_test_support+eg2" ]
   }
 }
 

ios/testing/earl_grey/BUILD.gn

@@ -22,6 +22,29 @@ source_set("earl_grey_support") {
     "matchers.mm",
   ]
 
+  defines = [ "CHROME_EARL_GREY_1" ]
+
+  public_configs = [ ":earl_grey_support_config" ]
+  configs += [ ":earl_grey_support_config" ]
+}
+
+source_set("eg_app_support+eg2") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+
+  deps = [
+    "//base/test:test_support",
+    "//ios/third_party/earl_grey2:app_framework+link",
+  ]
+
+  sources = [
+    "disabled_test_macros.h",
+    "matchers.h",
+    "matchers.mm",
+  ]
+
+  defines = [ "CHROME_EARL_GREY_2" ]
+
   public_configs = [ ":earl_grey_support_config" ]
   configs += [ ":earl_grey_support_config" ]
 }

ios/testing/earl_grey/matchers.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <EarlGrey/EarlGrey.h>
+@protocol GREYMatcher;
 
 namespace testing {
 

ios/testing/earl_grey/matchers.mm

@@ -8,6 +8,15 @@
 #error "This file requires ARC support."
 #endif
 
+#if defined(CHROME_EARL_GREY_1)
+#import <EarlGrey/EarlGrey.h>
+#endif
+
+#if defined(CHROME_EARL_GREY_2)
+#import <AppFramework/EarlGreyApp.h>
+#import <AppFramework/Matcher/GREYMatchersShorthand.h>
+#endif
+
 namespace testing {
 
 id<GREYMatcher> ButtonWithAccessibilityLabel(NSString* label) {