[iOS][EG2] Enable testTappingKeyboardDismissCreditCardControllerPopOver

Bug: 1017095
Change-Id: I6447e6e01f8aa478aa896d65cbcd6d0265731670
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1890038Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710821}

ios/chrome/browser/ui/autofill/manual_fill/card_view_controller_egtest.mm

@@ -14,6 +14,7 @@
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/earl_grey/app_launch_manager.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
+#import "ios/testing/earl_grey/keyboard_app_interface.h"
 #include "ios/web/public/test/element_selector.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/gurl.h"
@@ -436,8 +437,7 @@ BOOL WaitForKeyboardToAppear() {
 
 // Tests that the credit card View Controller is dismissed when tapping the
 // keyboard.
-// TODO(crbug.com/1017095): Re-enable this test.
-- (void)DISABLED_testTappingKeyboardDismissCreditCardControllerPopOver {
+- (void)testTappingKeyboardDismissCreditCardControllerPopOver {
   if (![ChromeEarlGrey isIPadIdiom]) {
     return;
   }
@@ -457,7 +457,7 @@ BOOL WaitForKeyboardToAppear() {
       assertWithMatcher:grey_sufficientlyVisible()];
 
   [[EarlGrey
-      selectElementWithMatcher:ManualFallbackCreditCardTableViewMatcher()]
+      selectElementWithMatcher:[KeyboardAppInterface keyboardWindowMatcher]]
       performAction:grey_typeText(@"text")];
 
   // Verify the credit card controller table view and the credit card icon is

ios/chrome/browser/ui/autofill/manual_fill/fallback_coordinator_egtest.mm

@@ -20,16 +20,6 @@
 #error "This file requires ARC support."
 #endif
 
-#if defined(CHROME_EARL_GREY_2)
-// TODO(crbug.com/1015113): The EG2 macro is breaking indexing for some reason
-// without the trailing semicolon.  For now, disable the extra semi warning
-// so Xcode indexing works for the egtest.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++98-compat-extra-semi"
-GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(KeyboardAppInterface);
-#pragma clang diagnostic pop
-#endif  // defined(CHROME_EARL_GREY_2)
-
 using base::test::ios::kWaitForActionTimeout;
 using chrome_test_util::AutofillSuggestionViewMatcher;
 using chrome_test_util::ManualFallbackFormSuggestionViewMatcher;

ios/testing/earl_grey/BUILD.gn

@@ -84,6 +84,7 @@ source_set("eg_test_support+eg2") {
     "earl_grey_test.h",
     "earl_grey_test.mm",
     "keyboard_app_interface.h",
+    "keyboard_app_interface_stub.mm",
     "matchers.h",
     "matchers.mm",
   ]

ios/testing/earl_grey/keyboard_app_interface_stub.mm

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ios/testing/earl_grey/earl_grey_test.h"
+#import "ios/testing/earl_grey/keyboard_app_interface.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+#if defined(CHROME_EARL_GREY_2)
+// TODO(crbug.com/1015113): The EG2 macro is breaking indexing for some reason
+// without the trailing semicolon.  For now, disable the extra semi warning
+// so Xcode indexing works for the egtest.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat-extra-semi"
+GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(KeyboardAppInterface);
+#pragma clang diagnostic pop
+#endif  // defined(CHROME_EARL_GREY_2)