Create shared matcher for navigation bar done button.

ios/chrome/browser/ui/keyboard_commands_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 <XCTest/XCTest.h>
 
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ui/browser_view_controller.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
@@ skipping 10 matching lines @@
 #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"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
+using chrome_test_util::NavigationBarDoneButton;
+
 const CGFloat kScrollDisplacement = 50.0;
 
 // Test cases to verify that keyboard commands are and are not registered when
 // expected.
 @interface KeyboardCommandsTestCase : ChromeTestCase
 @end
 
 @implementation KeyboardCommandsTestCase
 
 #pragma mark - Helpers
@@ skipping 90 matching lines @@
 
 // Tests that keyboard commands are not registered when Settings are shown.
 - (void)testKeyboardCommandsNotRegistered_SettingsPresented {
   // Open Settings
   id<GREYMatcher> toolsMenuSettings =
       grey_accessibilityID(kToolsMenuSettingsId);
   [self selectToolsMenuItem:toolsMenuSettings];
 
   [self verifyNoKeyboardCommandsAreRegistered];
 
-  // Close Settings
-  id<GREYMatcher> settingsDoneButton =
-      chrome_test_util::ButtonWithAccessibilityLabelId(
-          IDS_IOS_NAVIGATION_BAR_DONE_BUTTON);
-  [[EarlGrey selectElementWithMatcher:settingsDoneButton]
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 }
 
 // Tests that keyboard commands are not registered when the bookmark UI is
 // shown.
 - (void)testKeyboardCommandsNotRegistered_AddBookmarkPresented {
   [self verifyBookmarksLoaded];
   BOOL success = chrome_test_util::ClearBookmarks();
   GREYAssert(success, @"Not all bookmarks were removed.");
 
@@ skipping 67 matching lines @@
   [self verifyKeyboardCommandsAreRegistered];
 
   UIResponder* firstResponder = GetFirstResponder();
   GREYAssert(
       [firstResponder isKindOfClass:NSClassFromString(@"WKContentView")],
       @"Expected first responder to be a WKContentView. Instead, is a %@",
       NSStringFromClass([firstResponder class]));
 }
 
 @end