Convert closeCurrentTab navigator helper to compile under EG2.

Added closeCurrentTab in smoke_egtest.

Bug: 922813
Change-Id: I79f5066d068f38b97af4527b6c2b1562bd2a3a7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1625849
Commit-Queue: Maksym Onufriienko <monufriienko@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662825}

ios/chrome/test/earl_grey/chrome_earl_grey.h

@@ -107,6 +107,9 @@ id ExecuteJavaScript(NSString* javascript, NSError* __autoreleasing* out_error);
 // CHROME_EG_ASSERT_NO_ERROR is removed.
 - (NSError*)waitForPageToFinishLoading;
 
+// Closes the current tab and waits for the UI to complete.
+- (void)closeCurrentTab;
+
 @end
 
 // Helpers that only compile under EarlGrey 1 are included in this "EG1"
@@ -127,9 +130,6 @@ id ExecuteJavaScript(NSString* javascript, NSError* __autoreleasing* out_error);
 // Checks whether current WebState is loading.
 - (BOOL)isLoading WARN_UNUSED_RESULT;
 
-// Closes the current tab and waits for the UI to complete.
-- (void)closeCurrentTab;
-
 // Waits for a static html view containing |text|. If the condition is not met
 // within a timeout, a GREYAssert is induced.
 // TODO(crbug.com/963613): Change return type to void when

ios/chrome/test/earl_grey/chrome_earl_grey.mm

@@ -77,14 +77,14 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(ChromeEarlGreyAppInterface)
   return nil;
 }
 
-- (NSError*)reload {
-  [ChromeEarlGreyAppInterface startReloading];
+- (NSError*)goForward {
+  [ChromeEarlGreyAppInterface startGoingForward];
   [self waitForPageToFinishLoading];
   return nil;
 }
 
-- (NSError*)goForward {
-  [ChromeEarlGreyAppInterface startGoingForward];
+- (NSError*)reload {
+  [ChromeEarlGreyAppInterface startReloading];
   [self waitForPageToFinishLoading];
   return nil;
 }
@@ -149,6 +149,11 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(ChromeEarlGreyAppInterface)
   return [self loadURL:URL waitForCompletion:YES];
 }
 
+- (void)closeCurrentTab {
+  [ChromeEarlGreyAppInterface closeCurrentTab];
+  [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
+}
+
 @end
 
 // The helpers below only compile under EarlGrey1.
@@ -220,11 +225,6 @@ id ExecuteJavaScript(NSString* javascript,
   return chrome_test_util::IsLoading();
 }
 
-- (void)closeCurrentTab {
-  chrome_test_util::CloseCurrentTab();
-  [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
-}
-
 - (NSError*)waitForErrorPage {
   NSString* const kErrorPageText =
       l10n_util::GetNSString(IDS_ERRORPAGES_HEADING_NOT_AVAILABLE);

ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.h

@@ -52,6 +52,9 @@
 // Navigates forward to the next page without waiting for the page to load.
 + (void)startGoingForward;
 
+// Closes current tab.
++ (void)closeCurrentTab;
+
 @end
 
 #endif  // IOS_CHROME_TEST_EARL_GREY_CHROME_EARL_GREY_APP_INTERFACE_H_

ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm

@@ -75,4 +75,8 @@ using chrome_test_util::BrowserCommandDispatcherForMainBVC;
   [BrowserCommandDispatcherForMainBVC() goForward];
 }
 
++ (void)closeCurrentTab {
+  chrome_test_util::CloseCurrentTab();
+}
+
 @end

ios/chrome/test/earl_grey2/smoke_egtest.mm

@@ -125,6 +125,8 @@
   [ChromeEarlGrey closeAllTabsInCurrentMode];
   [ChromeEarlGrey closeAllIncognitoTabs];
   [ChromeEarlGrey openNewTab];
+  [ChromeEarlGrey closeCurrentTab];
+  [ChromeEarlGrey openNewTab];
 }
 
 @end