Delete TapButtonWithLabelId from first_run_egtest.mm.

ios/chrome/browser/ui/first_run/first_run_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 "base/strings/sys_string_conversions.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_reporting_default_state.h"
@@ skipping 16 matching lines @@
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/public/provider/chrome/browser/signin/fake_chrome_identity.h"
 #import "ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.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::AccountConsistencySetupSigninButton;
+using chrome_test_util::ButtonWithAccessibilityLabelId;
+using chrome_test_util::NavigationBarDoneButton;
+
 namespace {
 
 // Returns a fake identity.
 ChromeIdentity* GetFakeIdentity() {
   return [FakeChromeIdentity identityWithEmail:@"foo@gmail.com"
                                         gaiaID:@"fooID"
                                           name:@"Fake Foo"];
 }
 
-// Taps the button with accessibility labelId |message_id|.
-void TapButtonWithLabelId(int message_id) {
-  id<GREYMatcher> matcher = chrome_test_util::ButtonWithAccessibilityLabel(
-      l10n_util::GetNSString(message_id));
-  [[EarlGrey selectElementWithMatcher:matcher] performAction:grey_tap()];
+// Returns matcher for the opt in accept button.
+id<GREYMatcher> FirstRunOptInAcceptButton() {
+  return ButtonWithAccessibilityLabelId(IDS_IOS_FIRSTRUN_OPT_IN_ACCEPT_BUTTON);
+}
+
+// Returns matcher for the skip sign in button.
+id<GREYMatcher> SkipSigninButton() {

[Eugene But (OOO till 7-30), 2017/04/18 01:17:33]

nit: s/SkipSigninButton/SkipSignInButton

[baxley, 2017/04/18 18:44:24]

In most of our code, we refer to "signin" as a one word noun. It isn't that
consistent, but I'll leave it as is after offline discussion.

+  return grey_accessibilityID(kSignInSkipButtonAccessibilityIdentifier);
+}
+
+// Returns matcher for the first run account consistency skip button.
+id<GREYMatcher> FirstRunAccountConsistencySkipButton() {
+  return ButtonWithAccessibilityLabelId(
+      IDS_IOS_FIRSTRUN_ACCOUNT_CONSISTENCY_SKIP_BUTTON);
+}
+
+// Returns matcher for the undo sign in button.
+id<GREYMatcher> UndoAccountConsistencyButton() {
+  return ButtonWithAccessibilityLabelId(
+      IDS_IOS_ACCOUNT_CONSISTENCY_CONFIRMATION_UNDO_BUTTON);
 }
 
 // Asserts that |identity| is actually signed in to the active profile.
 void AssertAuthenticatedIdentityInActiveProfile(ChromeIdentity* identity) {
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
 
   ios::ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   AccountInfo info =
       ios::SigninManagerFactory::GetForBrowserState(browser_state)
@@ skipping 67 matching lines @@
 }
 
 // Toggle the UMA checkbox.
 - (void)testToggleMetricsOn {
   [chrome_test_util::GetMainController() showFirstRunUI];
 
   id<GREYMatcher> metrics =
       grey_accessibilityID(kUMAMetricsButtonAccessibilityIdentifier);
   [[EarlGrey selectElementWithMatcher:metrics] performAction:grey_tap()];
 
-  id<GREYMatcher> optInAccept = chrome_test_util::ButtonWithAccessibilityLabel(
-      l10n_util::GetNSString(IDS_IOS_FIRSTRUN_OPT_IN_ACCEPT_BUTTON));
-  [[EarlGrey selectElementWithMatcher:optInAccept] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:FirstRunOptInAcceptButton()]
+      performAction:grey_tap()];
 
   BOOL metricsOptIn = GetApplicationContext()->GetLocalState()->GetBoolean(
       metrics::prefs::kMetricsReportingEnabled);
   GREYAssert(
       metricsOptIn != [WelcomeToChromeViewController defaultStatsCheckboxValue],
       @"Metrics reporting pref is incorrect.");
 }
 
 // Dismisses the first run screens.
 - (void)testDismissFirstRun {
   [chrome_test_util::GetMainController() showFirstRunUI];
 
-  id<GREYMatcher> optInAccept = chrome_test_util::ButtonWithAccessibilityLabel(
-      l10n_util::GetNSString(IDS_IOS_FIRSTRUN_OPT_IN_ACCEPT_BUTTON));
-  [[EarlGrey selectElementWithMatcher:optInAccept] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:FirstRunOptInAcceptButton()]
+      performAction:grey_tap()];
 
   PrefService* preferences = GetApplicationContext()->GetLocalState();
   GREYAssert(
       preferences->GetBoolean(metrics::prefs::kMetricsReportingEnabled) ==
           [WelcomeToChromeViewController defaultStatsCheckboxValue],
       @"Metrics reporting does not match.");
 
-  id<GREYMatcher> skipSignIn =
-      grey_accessibilityID(kSignInSkipButtonAccessibilityIdentifier);
-  [[EarlGrey selectElementWithMatcher:skipSignIn] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:SkipSigninButton()]
+      performAction:grey_tap()];
 
   id<GREYMatcher> newTab =
       grey_kindOfClass(NSClassFromString(@"NewTabPageView"));
   [[EarlGrey selectElementWithMatcher:newTab]
       assertWithMatcher:grey_sufficientlyVisible()];
 }
 
 // Signs in to an account and then taps the Undo button to sign out.
 - (void)testSignInAndUndo {
   ChromeIdentity* identity = GetFakeIdentity();
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()->AddIdentity(
       identity);
 
   // Launch First Run and accept tems of services.
   [chrome_test_util::GetMainController() showFirstRunUI];
-  TapButtonWithLabelId(IDS_IOS_FIRSTRUN_OPT_IN_ACCEPT_BUTTON);
+  [[EarlGrey selectElementWithMatcher:FirstRunOptInAcceptButton()]
+      performAction:grey_tap()];
 
   // Sign In |identity|.
-  TapButtonWithLabelId(IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SIGNIN_BUTTON);
+  [[EarlGrey selectElementWithMatcher:AccountConsistencySetupSigninButton()]
+      performAction:grey_tap()];
+
   AssertAuthenticatedIdentityInActiveProfile(identity);
 
   // Undo the sign-in and dismiss the Sign In screen.
-  TapButtonWithLabelId(IDS_IOS_ACCOUNT_CONSISTENCY_CONFIRMATION_UNDO_BUTTON);
-  TapButtonWithLabelId(IDS_IOS_FIRSTRUN_ACCOUNT_CONSISTENCY_SKIP_BUTTON);
+  [[EarlGrey selectElementWithMatcher:UndoAccountConsistencyButton()]
+      performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:FirstRunAccountConsistencySkipButton()]
+      performAction:grey_tap()];
 
   // |identity| shouldn't be signed in.
   AssertAuthenticatedIdentityInActiveProfile(nil);
 }
 
 // Signs in to an account and then taps the Advanced link to go to settings.
 - (void)testSignInAndTapSettingsLink {
   ChromeIdentity* identity = GetFakeIdentity();
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()->AddIdentity(
       identity);
 
   // Launch First Run and accept tems of services.
   [chrome_test_util::GetMainController() showFirstRunUI];
-  TapButtonWithLabelId(IDS_IOS_FIRSTRUN_OPT_IN_ACCEPT_BUTTON);
+  [[EarlGrey selectElementWithMatcher:FirstRunOptInAcceptButton()]
+      performAction:grey_tap()];
 
   // Sign In |identity|.
-  TapButtonWithLabelId(IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SIGNIN_BUTTON);
+  [[EarlGrey selectElementWithMatcher:AccountConsistencySetupSigninButton()]
+      performAction:grey_tap()];
   AssertAuthenticatedIdentityInActiveProfile(identity);
 
   // Tap Settings link.
   id<GREYMatcher> settings_link_matcher = grey_allOf(
       grey_accessibilityLabel(@"Settings"), grey_sufficientlyVisible(), nil);
   [[EarlGrey selectElementWithMatcher:settings_link_matcher]
       performAction:grey_tap()];
 
   // Check Sync hasn't started yet, allowing the user to change somes settings.
   SyncSetupService* sync_service = SyncSetupServiceFactory::GetForBrowserState(
       chrome_test_util::GetOriginalBrowserState());
   GREYAssertFalse(sync_service->HasFinishedInitialSetup(),
                   @"Sync shouldn't have finished its original setup yet");
 
   // Close Settings, user is still signed in and sync is now starting.
-  TapButtonWithLabelId(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON);
+  [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
+      performAction:grey_tap()];
   AssertAuthenticatedIdentityInActiveProfile(identity);
   GREYAssertTrue(sync_service->HasFinishedInitialSetup(),
                  @"Sync should have finished its original setup");
 }
 
 @end