Call test method setups after relaunching app in EG2 tests

- Added test method setups in |-appLaunchManagerDidRelaunchApp| in
|ChromeTestCase|, which will do resets and open a new tab after app is
relaunched. Introduced a flag in |ChromeTestCase| to prevent these
setups from called twice after one relaunch.

- Added in smoke test to test if new tab is opened after relaunch.

- Remove user's [ChromeEarlGrey openNewTab] call after calling
|ensureAppLaunchedWithFeaturesEnabled|.


Bug: 922813, 1004565
Change-Id: I525fb7492777fdd29b9491a2d6927b64fd58df7c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1835022
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702492}

ios/chrome/browser/ui/settings/autofill/autofill_add_credit_card_egtest.mm

@@ -100,7 +100,6 @@ id<GREYMatcher> CardNumberIconView(NSString* icon_type) {
                  @"SettingsAddPaymentMethod should be enabled");
   GREYAssertTrue([ChromeEarlGrey isCreditCardScannerEnabled],
                  @"CreditCardScanner should be enabled");
-  [ChromeEarlGrey openNewTab];
   [ChromeEarlGreyUI openSettingsMenu];
   [ChromeEarlGreyUI tapSettingsMenuButton:PaymentMethodsButton()];
   [[EarlGrey selectElementWithMatcher:AddPaymentMethodButton()]

ios/chrome/test/earl_grey/chrome_test_case.mm

@@ -122,6 +122,10 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(ChromeTestCaseAppInterface)
   // Block to be executed during object tearDown.
   ProceduralBlock _tearDownHandler;
 
+  // This flag indicates whether test method -setUp steps are executed during a
+  // test method.
+  BOOL _executedTestMethodSetUp;
+
   BOOL _isHTTPServerStopped;
   BOOL _isMockAuthenticationDisabled;
   std::unique_ptr<net::EmbeddedTestServer> _testServer;
@@ -248,6 +252,7 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(ChromeTestCaseAppInterface)
   // Reset any remaining sign-in state from previous tests.
   [ChromeEarlGrey signOutAndClearAccounts];
   [ChromeEarlGrey openNewTab];
+  _executedTestMethodSetUp = YES;
 }
 
 // Tear down called once per test, to close all tabs and menus, and clear the
@@ -291,6 +296,7 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(ChromeTestCaseAppInterface)
 #endif
   }
   [super tearDown];
+  _executedTestMethodSetUp = NO;
 }
 
 #pragma mark - Public methods
@@ -439,8 +445,20 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(ChromeTestCaseAppInterface)
   // +setUpHelper can not be called twice during setup process.
   if (gExecutedSetUpForTestCase) {
     [ChromeTestCase setUpHelper];
+
+    // Do not call test method setup steps if the app was relaunched before
+    // -setUp is executed. If do so, two new tabs will be opened before test
+    // method starts.
+    if (_executedTestMethodSetUp) {
+      [self resetAppState];
+
+      ResetAuthentication();
+
+      // Reset any remaining sign-in state from previous tests.
+      [ChromeEarlGrey signOutAndClearAccounts];
+      [ChromeEarlGrey openNewTab];
+    }
   }
-  [self resetAppState];
 }
 
 @end

ios/chrome/test/earl_grey2/smoke_egtest.mm

@@ -208,6 +208,9 @@
                  @"NewOmniboxPopupLayout should be enabled");
   GREYAssertTrue([ChromeEarlGrey isSlimNavigationManagerEnabled],
                  @"SlimNavigationManager should be enabled");
+
+  GREYAssertEqual([ChromeEarlGrey mainTabCount], 1U,
+                  @"Exactly one new tab should be opened.");
 }
 
 // Tests isCompactWidth method in chrome_earl_grey.h.