Create shared matcher for navigation bar done button.

ios/chrome/browser/ui/settings/autofill_settings_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 <XCTest/XCTest.h>
 
 #import "base/mac/bind_objc_block.h"
 #import "ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/test/app/web_view_interaction_test_util.h"
 #include "ios/chrome/test/earl_grey/accessibility_util.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/web/public/test/http_server.h"
 #include "ios/web/public/test/http_server_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using chrome_test_util::ButtonWithAccessibilityLabel;
 using chrome_test_util::ButtonWithAccessibilityLabelId;
+using chrome_test_util::NavigationBarDoneButton;
 
 namespace {
 
 // Expectation of how the saved autofill profile looks like, a map from cell
 // name IDs to expected contents.
 struct DisplayStringIDToExpectedResult {
   int display_string_id;
   NSString* expected_result;
 };
 
@@ skipping 62 matching lines @@
                                    grey_accessibilityTrait(
                                        UIAccessibilityTraitStaticText),
                                    nil)] performAction:grey_tap()];
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(grey_accessibilityLabel(@"Cut"),
                                           grey_accessibilityTrait(
                                               UIAccessibilityTraitStaticText),
                                           nil)] performAction:grey_tap()];
 
   // Switch off edit mode.
-  [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabelId(
-                                          IDS_IOS_NAVIGATION_BAR_DONE_BUTTON)]
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 }
 
 }  // namespace
 
 // Various tests for the Autofill section of the settings.
 @interface AutofillSettingsTestCase : ChromeTestCase
 @end
 
 @implementation AutofillSettingsTestCase
@@ skipping 36 matching lines @@
                                    grey_accessibilityID(backButtonA11yId),
                                    grey_accessibilityTrait(
                                        UIAccessibilityTraitButton),
                                    nil)] performAction:grey_tap()];
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(
                                    grey_accessibilityID(backButtonA11yId),
                                    grey_accessibilityTrait(
                                        UIAccessibilityTraitButton),
                                    nil)] performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabelId(
-                                          IDS_IOS_NAVIGATION_BAR_DONE_BUTTON)]
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
   // Wait for UI components to finish loading.
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
 }
 
 // Test that submitting a form ensures saving the data as an autofill profile.
 - (void)testAutofillProfileSaving {
   [self loadAndSubmitTheForm];
   [self openEditAddress:@"George Washington, 1600 Pennsylvania Ave NW"];
 
@@ skipping 25 matching lines @@
     [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabelId(
                                             IDS_IOS_NAVIGATION_BAR_EDIT_BUTTON)]
         performAction:grey_tap()];
 
     // Type the user-version of the country.
     [[EarlGrey selectElementWithMatcher:grey_accessibilityID(GetTextFieldForID(
                                             IDS_IOS_AUTOFILL_COUNTRY))]
         performAction:grey_typeText(expectation.user_typed_country)];
 
     // Switch off edit mode.
-    [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabelId(
-                                            IDS_IOS_NAVIGATION_BAR_DONE_BUTTON)]
+    [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
         performAction:grey_tap()];
 
     // Verify that the country value was changed to canonical.
     [[EarlGrey
         selectElementWithMatcher:
             grey_accessibilityLabel([NSString
                 stringWithFormat:@"%@, %@", l10n_util::GetNSString(
                                                 IDS_IOS_AUTOFILL_COUNTRY),
                                  expectation.expected_result])]
         assertWithMatcher:grey_notNil()];
@@ skipping 18 matching lines @@
   // Switch on edit mode.
   [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabelId(
                                           IDS_IOS_NAVIGATION_BAR_EDIT_BUTTON)]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
 
   [self exitSettingsMenu];
 }
 
 @end