Create shared matcher for navigation bar done button.

ios/chrome/browser/ui/history/history_ui_egtest.mm

 // Copyright 2016 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 <EarlGrey/EarlGrey.h>
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 24 matching lines @@
 #import "ios/web/public/test/http_server.h"
 #import "ios/web/public/test/http_server_util.h"
 #import "net/base/mac/url_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 using chrome_test_util::ButtonWithAccessibilityLabelId;
+using chrome_test_util::NavigationBarDoneButton;
 using chrome_test_util::OpenLinkInNewTabMenuItem;
 using chrome_test_util::WebViewContainingText;
 
 namespace {
 char kURL1[] = "http://firstURL";
 char kURL2[] = "http://secondURL";
 char kURL3[] = "http://thirdURL";
 char kTitle1[] = "Page 1";
 char kTitle2[] = "Page 2";
 char kResponse1[] = "Test Page 1 content";
@@ skipping 20 matching lines @@
   return grey_allOf(
       grey_kindOfClass([HistoryEntryCell class]),
       [[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
                                            descriptionBlock:describe],
       grey_sufficientlyVisible(), nil);
 }
 // Matcher for the history button in the tools menu.
 id<GREYMatcher> HistoryButton() {
   return ButtonWithAccessibilityLabelId(IDS_HISTORY_SHOW_HISTORY);
 }
-// Matcher for the done button in the navigation bar.
-id<GREYMatcher> NavigationDoneButton() {
-  // Include sufficientlyVisible condition for the case of the clear browsing
-  // dialog, which also has a "Done" button and is displayed over the history
-  // panel.
-  return grey_allOf(
-      ButtonWithAccessibilityLabelId(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON),
-      grey_sufficientlyVisible(), nil);
-}
 // Matcher for the edit button in the navigation bar.
 id<GREYMatcher> NavigationEditButton() {
   return ButtonWithAccessibilityLabelId(IDS_HISTORY_START_EDITING_BUTTON);
 }
 // Matcher for the delete button.
 id<GREYMatcher> DeleteHistoryEntriesButton() {
   // Include class restriction to exclude MDCCollectionViewInfoBar, which is
   // hidden.
   return grey_allOf(ButtonWithAccessibilityLabelId(
                         IDS_HISTORY_DELETE_SELECTED_ENTRIES_BUTTON),
@@ skipping 60 matching lines @@
                                    identity.userEmail)]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:
                  chrome_test_util::ButtonWithAccessibilityLabelId(
                      IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SIGNIN_BUTTON)]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:
                  chrome_test_util::ButtonWithAccessibilityLabelId(
                      IDS_IOS_ACCOUNT_CONSISTENCY_CONFIRMATION_OK_BUTTON)]
       performAction:grey_tap()];
-  [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::ButtonWithAccessibilityLabelId(
-                                   IDS_IOS_NAVIGATION_BAR_DONE_BUTTON)]
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 }
 }  // namespace
 
 // History UI tests.
 @interface HistoryUITestCase : ChromeTestCase {
   GURL _URL1;
   GURL _URL2;
   GURL _URL3;
 }
@@ skipping 37 matching lines @@
 }
 
 - (void)tearDown {
   NSError* error = nil;
   // Dismiss search bar by pressing cancel, if present. Passing error prevents
   // failure if the element is not found.
   [[EarlGrey selectElementWithMatcher:CancelButton()] performAction:grey_tap()
                                                               error:&error];
   // Dismiss history panel by pressing done, if present. Passing error prevents
   // failure if the element is not found.
-  [[EarlGrey selectElementWithMatcher:NavigationDoneButton()]
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()
               error:&error];
 
   // Some tests change the default values for the "Clear Browsing Data" settings
   // screen.
   [self resetBrowsingDataPrefs];
   [super tearDown];
 }
 
 #pragma mark Tests
@@ skipping 47 matching lines @@
 // help page.
 - (void)testHistoryEntriesStatusCell {
   [self loadTestURLs];
   [self openHistoryPanel];
   // Assert that no message is shown when the user is not signed in.
   NSRange range;
   NSString* entriesMessage = ParseStringWithLink(
       l10n_util::GetNSString(IDS_IOS_HISTORY_NO_SYNCED_RESULTS), &range);
   [[EarlGrey selectElementWithMatcher:grey_text(entriesMessage)]
       assertWithMatcher:grey_nil()];
-  [[EarlGrey selectElementWithMatcher:NavigationDoneButton()]
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 
   // Sign in and assert that the page indicates what type of history entries
   // are shown.
   MockSignIn();
   [self openHistoryPanel];
   // Assert that message about entries is shown. The "history is showing local
   // entries" message will be shown because sync is not set up for this test.
   [[EarlGrey selectElementWithMatcher:grey_text(entriesMessage)]
       assertWithMatcher:grey_notNil()];
@@ skipping 89 matching lines @@
       performAction:grey_tap()];
 
   // There is not currently a matcher for acessibilityElementIsFocused or
   // userInteractionEnabled which could be used here instead of checking that
   // the button is not a MDCCollectionViewTextCell. Use when available.
   // TODO(crbug.com/638674): Evaluate if this can move to shared code.
   id<GREYMatcher> confirmClear = grey_allOf(
       ClearBrowsingDataButton(),
       grey_not(grey_kindOfClass([MDCCollectionViewTextCell class])), nil);
   [[EarlGrey selectElementWithMatcher:confirmClear] performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:NavigationDoneButton()]
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 
   [self assertNoHistoryShown];
 }
 
 // Tests display and selection of 'Open in New Tab' in a context menu on a
 // history entry.
 - (void)testContextMenuOpenInNewTab {
   [self loadTestURLs];
   [self openHistoryPanel];
@@ skipping 59 matching lines @@
       });
   GREYAssertTrue(success, @"Pasteboard URL was not set to %s",
                  _URL1.spec().c_str());
 }
 
 // Navigates to history and checks elements for accessibility.
 - (void)testAccessibilityOnHistory {
   [self openHistoryPanel];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   // Close history.
-  [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::ButtonWithAccessibilityLabelId(
-                                   IDS_IOS_NAVIGATION_BAR_DONE_BUTTON)]
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 }
 
 #pragma mark Helper Methods
 
 - (void)loadTestURLs {
   [ChromeEarlGrey loadURL:_URL1];
   [[EarlGrey selectElementWithMatcher:WebViewContainingText(kResponse1)]
       assertWithMatcher:grey_notNil()];
 
@@ skipping 29 matching lines @@
 - (void)resetBrowsingDataPrefs {
   PrefService* prefs = chrome_test_util::GetOriginalBrowserState()->GetPrefs();
   prefs->ClearPref(browsing_data::prefs::kDeleteBrowsingHistory);
   prefs->ClearPref(browsing_data::prefs::kDeleteCookies);
   prefs->ClearPref(browsing_data::prefs::kDeleteCache);
   prefs->ClearPref(browsing_data::prefs::kDeletePasswords);
   prefs->ClearPref(browsing_data::prefs::kDeleteFormData);
 }
 
 @end