Move delay before tapping tools menu to global location.

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/sys_string_conversions.h"
 #include "components/browsing_data/core/pref_names.h"
@@ skipping 200 matching lines @@
   // Some tests change the default values for the "Clear Browsing Data" settings
   // screen.
   [self resetBrowsingDataPrefs];
   [super tearDown];
 }
 
 #pragma mark Tests
 
 // Tests that no history is shown if there has been no navigation.
 - (void)testDisplayNoHistory {
-  // TODO(crbug.com/685570): Fix the tap instead of adding a delay.
-  GREYCondition* myCondition = [GREYCondition
-      conditionWithName:@"Delay to ensure the toolbar menu can be opened"
-                  block:^BOOL {
-                    return NO;
-                  }];
-  [myCondition waitWithTimeout:0.5];
-
   [self openHistoryPanel];
   [self assertNoHistoryShown];
 }
 
 // Tests that the history panel displays navigation history.
 - (void)testDisplayHistory {
   [self loadTestURLs];
   [self openHistoryPanel];
 
   // Assert that history displays three entries.
@@ skipping 205 matching lines @@
       testing::WaitUntilConditionOrTimeout(testing::kWaitForUIElementTimeout, ^{
         return _URL1 ==
                net::GURLWithNSURL([UIPasteboard generalPasteboard].URL);
       });
   GREYAssertTrue(success, @"Pasteboard URL was not set to %s",
                  _URL1.spec().c_str());
 }
 
 // Navigates to history and checks elements for accessibility.
 - (void)testAccessibilityOnHistory {
-  // TODO(crbug.com/685570): Fix the tap instead of adding a delay.
-  GREYCondition* myCondition = [GREYCondition
-      conditionWithName:@"Delay to ensure the toolbar menu can be opened"
-                  block:^BOOL {
-                    return NO;
-                  }];
-  [myCondition waitWithTimeout:0.5];
-
   [self openHistoryPanel];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   // Close history.
   [[EarlGrey
       selectElementWithMatcher:chrome_test_util::ButtonWithAccessibilityLabelId(
                                    IDS_IOS_NAVIGATION_BAR_DONE_BUTTON)]
       performAction:grey_tap()];
 }
 
 #pragma mark Helper Methods
@@ skipping 41 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