Move EarlGrey helper to check toolbar visibility into ChromeEarlGreyUI.

ios/chrome/browser/web/progress_indicator_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>
 
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "ios/chrome/test/app/navigation_test_util.h"
 #include "ios/chrome/test/app/web_view_interaction_test_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"
-#include "ios/chrome/test/earl_grey/chrome_util.h"
 #import "ios/testing/earl_grey/disabled_test_macros.h"
 #import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
 #import "ios/web/public/test/http_server.h"
 #import "ios/web/public/test/http_server_util.h"
 #include "ios/web/public/test/response_providers/html_response_provider.h"
 #include "url/gurl.h"
 
 using chrome_test_util::WebViewContainingText;
 
 namespace {
@@ skipping 122 matching lines @@
   chrome_test_util::LoadUrl(infinitePendingURL);
 
   // Wait until the page is half loaded.
   [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageText)]
       assertWithMatcher:grey_notNil()];
 
   // Verify progress view visible and halfway progress.
   [[EarlGrey selectElementWithMatcher:ProgressViewWithProgress(0.5)]
       assertWithMatcher:grey_sufficientlyVisible()];
 
-  // Verify toolbar visible.
-  chrome_test_util::AssertToolbarVisible();
+  GREYAssertTrue([ChromeEarlGreyUI waitForToolbarVisible:YES],
+                 @"Toolbar was not visible");
 }
 
 // Tests that the progress indicator is shown and has expected progress value
 // after a form is submitted, and the toolbar is visible.
 - (void)testProgressIndicatorShownOnFormSubmit {
   if (IsIPadIdiom()) {
     EARL_GREY_TEST_SKIPPED(@"Skipped for iPad (no progress view in tablet)");
   }
 
   const GURL formURL = web::test::HttpServer::MakeUrl(kFormURL);
@@ skipping 18 matching lines @@
   chrome_test_util::SubmitWebViewFormWithId(kFormID);
 
   // Wait until the page is half loaded.
   [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageText)]
       assertWithMatcher:grey_notNil()];
 
   // Verify progress view visible and halfway progress.
   [[EarlGrey selectElementWithMatcher:ProgressViewWithProgress(0.5)]
       assertWithMatcher:grey_sufficientlyVisible()];
 
-  // Verify toolbar visible.
-  chrome_test_util::AssertToolbarVisible();
+  GREYAssertTrue([ChromeEarlGreyUI waitForToolbarVisible:YES],
+                 @"Toolbar was not visible");
 }
 
 // Tests that the progress indicator disappears after form has been submitted.
 - (void)testProgressIndicatorDisappearsAfterFormSubmit {
   if (IsIPadIdiom()) {
     EARL_GREY_TEST_SKIPPED(@"Skipped for iPad (no progress view in tablet)");
   }
 
   const GURL formURL = web::test::HttpServer::MakeUrl(kFormURL);
   const GURL simplePageURL = web::test::HttpServer::MakeUrl(kSimplePageURL);
@@ skipping 40 matching lines @@
       assertWithMatcher:grey_notNil()];
 
   chrome_test_util::SubmitWebViewFormWithId(kFormID);
 
   // Verify progress view is not visible.
   [[EarlGrey selectElementWithMatcher:grey_kindOfClass([MDCProgressView class])]
       assertWithMatcher:grey_notVisible()];
 }
 
 @end