Clean up usages of chrome_test_util::NavigationBarDoneButton()

There are still tests that wraps NavigationBarDoneButton with a local
helper function, which is unnecessary, instead, we should call EarlGrey
explicitly like following:

[[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
      performAction:grey_tap()];

So, this CL cleans them up.

Bug: 741898
Change-Id: I74ea738cb1e58b1ee44da57c1dfaf74b7c348405
Reviewed-on: https://chromium-review.googlesource.com/568271Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Mihai Sardarescu (OOO) <msarda@chromium.org>
Reviewed-by: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: Mike Baxley <baxley@chromium.org>
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488490}

ios/chrome/browser/ui/authentication/signin_interaction_controller_egtest.mm

@@ -415,9 +415,7 @@ void AssertAuthenticatedIdentityInActiveProfile(ChromeIdentity* identity) {
   [[EarlGrey selectElementWithMatcher:settings_link_matcher]
       performAction:grey_tap()];
 
-  id<GREYMatcher> done_button_matcher = NavigationBarDoneButton();
-  WaitForMatcher(done_button_matcher);
-  [[EarlGrey selectElementWithMatcher:done_button_matcher]
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 
   // All Settings should be gone and user signed in.

ios/chrome/browser/ui/settings/clear_browsing_data_egtest.mm

@@ -38,13 +38,6 @@ using chrome_test_util::SettingsMenuPrivacyButton;
       performAction:grey_tap()];
 }
 
-- (void)exitSettingsMenu {
-  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
-      performAction:grey_tap()];
-  // Wait for UI components to finish loading.
-  [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
-}
-
 // Test that opening the clear browsing data dialog does not cause a crash.
 - (void)testOpeningClearBrowsingData {
   NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
@@ -53,7 +46,8 @@ using chrome_test_util::SettingsMenuPrivacyButton;
   [defaults setObject:@"Enabled" forKey:@"EnableNewClearBrowsingDataUI"];
 
   [self openClearBrowsingDataDialog];
-  [self exitSettingsMenu];
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 
   [defaults setObject:oldSetting forKey:@"EnableNewClearBrowsingDataUI"];
 }

ios/chrome/browser/ui/settings/passwords_settings_egtest.mm

@@ -56,6 +56,7 @@
 using autofill::PasswordForm;
 using chrome_test_util::ButtonWithAccessibilityLabel;
 using chrome_test_util::SettingsMenuBackButton;
+using chrome_test_util::NavigationBarDoneButton;
 
 namespace {
 
@@ -342,13 +343,6 @@ void TapEdit() {
       performAction:grey_tap()];
 }
 
-// Tap Done in any settings view.
-void TapDone() {
-  [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::NavigationBarDoneButton()]
-      performAction:grey_tap()];
-}
-
 }  // namespace
 
 @interface MockReauthenticationModule : NSObject<ReauthenticationProtocol>
@@ -431,7 +425,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
 
   TapEdit();
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 
   // Inspect "password details" view.
   [GetInteractionForPasswordEntry(@"example.com, concrete username")
@@ -442,7 +437,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
 
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that attempts to copy a password provide appropriate feedback,
@@ -489,7 +485,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that attempts to copy a username provide appropriate feedback.
@@ -518,7 +515,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that attempts to copy a site URL provide appropriate feedback.
@@ -547,7 +545,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that deleting a password from password details view goes back to the
@@ -604,7 +603,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
 
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that deleting a password from password details can be cancelled.
@@ -652,7 +652,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
 
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that if the list view is in edit mode, then the details password view
@@ -679,7 +680,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
 
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that attempts to copy the site via the context menu item provide an
@@ -717,7 +719,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that attempts to copy the username via the context menu item provide
@@ -756,7 +759,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that attempts to copy the password via the context menu item provide
@@ -802,7 +806,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that attempts to show and hide the password via the context menu item
@@ -856,7 +861,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that federated credentials have no password but show the federation.
@@ -900,7 +906,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks the order of the elements in the detail view layout for a
@@ -956,7 +963,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks the order of the elements in the detail view layout for a blacklisted
@@ -1001,7 +1009,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks the order of the elements in the detail view layout for a federated
@@ -1059,7 +1068,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Check that stored entries are shown no matter what the preference for saving
@@ -1099,7 +1109,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
 
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Check that toggling the switch for the "save passwords" preference changes
@@ -1128,7 +1139,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
 
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Checks that deleting a password from the list view works.
@@ -1179,7 +1191,8 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
 
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
-  TapDone();
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 @end

ios/chrome/browser/ui/settings/settings_egtest.mm

@@ -290,16 +290,6 @@ bool IsCertificateCleared() {
       performAction:grey_scrollToContentEdge(kGREYContentEdgeTop)];
 }
 
-// Exits Settings by clicking on the Done button.
-- (void)dismissSettings {
-  // Dismiss the settings.
-  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
-      performAction:grey_tap()];
-
-  // Wait for UI components to finish loading.
-  [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
-}
-
 // From the NTP, clears the cookies and site data via the UI.
 - (void)clearCookiesAndSiteData {
   [ChromeEarlGreyUI openSettingsMenu];
@@ -316,7 +306,8 @@ bool IsCertificateCleared() {
       performAction:grey_tap()];
 
   [self clearBrowsingData];
-  [self dismissSettings];
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // From the NTP, clears the saved passwords via the UI.
@@ -350,7 +341,8 @@ bool IsCertificateCleared() {
   [[EarlGrey selectElementWithMatcher:ClearSavedPasswordsButton()]
       performAction:grey_tap()];
 
-  [self dismissSettings];
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
 }
 
 // Enable password management.