Revert of Refine the accessibility label of Clear Browsing Data flow.

ios/chrome/browser/ui/settings/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 <EarlGrey/EarlGrey.h>
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 76 matching lines @@
 }
 // Matcher for the clear saved passwords cell on the clear browsing data panel.
 id<GREYMatcher> ClearSavedPasswordsButton() {
   return grey_allOf(grey_accessibilityID(kClearSavedPasswordsCellId),
                     grey_sufficientlyVisible(), nil);
 }
 // Matcher for the clear browsing data button on the clear browsing data panel.
 id<GREYMatcher> ClearBrowsingDataButton() {
   return ButtonWithAccessibilityLabelId(IDS_IOS_CLEAR_BUTTON);
 }
-// Matcher for the clear browsing data action sheet item.
-id<GREYMatcher> ConfirmClearBrowsingDataButton() {
-  return ButtonWithAccessibilityLabelId(IDS_IOS_CONFIRM_CLEAR_BUTTON);
-}
 // Matcher for the Settings button in the tools menu.
 id<GREYMatcher> SettingsButton() {
   return grey_accessibilityID(kToolsMenuSettingsId);
 }
 // Matcher for the Save Passwords cell on the main Settings screen.
 id<GREYMatcher> PasswordsButton() {
   return ButtonWithAccessibilityLabelId(IDS_IOS_SAVE_PASSWORDS);
 }
 // Matcher for the Privacy cell on the main Settings screen.
 id<GREYMatcher> PrivacyButton() {
@@ skipping 169 matching lines @@
   [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 }
 
 // Performs the steps to clear browsing data. Must be called on the
 // Clear Browsing Data settings screen, after having selected the data types
 // scheduled for removal.
 - (void)clearBrowsingData {
   [[EarlGrey selectElementWithMatcher:ClearBrowsingDataButton()]
       performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:ConfirmClearBrowsingDataButton()]
-      performAction:grey_tap()];
+
+  // There is not currently a matcher for accessibilityElementIsFocused 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()];
 }
 
 // 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];
@@ skipping 394 matching lines @@
 
   cookies = [ChromeEarlGrey cookies];
   GREYAssertEqual(0U, cookies.count, @"No cookie should be found.");
 
   chrome_test_util::CloseAllTabs();
 }
 
 // Verifies that logging into a form on a web page allows the user to save and
 // then clear a password.
 - (void)testClearPasswords {
+
   ios::ChromeBrowserState* browserState =
       chrome_test_util::GetOriginalBrowserState();
   PrefService* preferences = browserState->GetPrefs();
   bool defaultPasswordManagerSavingPref = preferences->GetBoolean(
       password_manager::prefs::kPasswordManagerSavingEnabled);
 
   [self enablePasswordManagement];
   [self setTearDownHandler:^{
     [self passwordsTearDown:defaultPasswordManagerSavingPref];
   }];
@@ skipping 318 matching lines @@
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:PrivacyButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SendUsageDataButton()]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 @end