Create ChromeEarlGrey waitForWebViewContainingText.

ios/chrome/browser/web/push_and_replace_state_navigation_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 <XCTest/XCTest.h>
 
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
@@ skipping 212 matching lines @@
 }
 
 // Tests calling pushState with unicode characters.
 - (void)testHtml5HistoryPushUnicodeCharacters {
   const GURL pushStateUnicodeURLEncoded = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/"
       "history.html#unicode%E1%84%91");
   const GURL pushStateUnicode2URLEncoded = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/"
       "history.html#unicode2%E2%88%A2");
-  std::string pushStateUnicodeLabel = "Action: pushStateUnicodeᄑ";
+  NSString* pushStateUnicodeLabel = @"Action: pushStateUnicodeᄑ";
   NSString* pushStateUnicodeStatus = @"pushStateUnicodeᄑ";
-  std::string pushStateUnicode2Label = "Action: pushStateUnicode2∢";
+  NSString* pushStateUnicode2Label = @"Action: pushStateUnicode2∢";
   NSString* pushStateUnicode2Status = @"pushStateUnicode2∢";
 
   web::test::SetUpFileBasedHttpServer();
   [ChromeEarlGrey loadURL:web::test::HttpServer::MakeUrl(kHistoryTestUrl)];
 
   // TODO(crbug.com/643458): The fact that the URL shows %-escaped is due to
   // NSURL escaping to make UIWebView/JS happy. See if it's possible to
   // represent differently such that it displays unescaped.
   // Do 2 push states with unicode characters.
   [ChromeEarlGrey tapWebViewElementWithID:@"pushStateUnicode"];
   [[EarlGrey
       selectElementWithMatcher:chrome_test_util::OmniboxText(
                                    pushStateUnicodeURLEncoded.GetContent())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewContainingText(
-                                          pushStateUnicodeLabel)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:pushStateUnicodeLabel];
 
   [ChromeEarlGrey tapWebViewElementWithID:@"pushStateUnicode2"];
   [[EarlGrey
       selectElementWithMatcher:chrome_test_util::OmniboxText(
                                    pushStateUnicode2URLEncoded.GetContent())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewContainingText(
-                                          pushStateUnicode2Label)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:pushStateUnicode2Label];
 
   // Do a push state without a unicode character.
   const GURL pushStatePathURL =
       web::test::HttpServer::MakeUrl(kPushStatePathURL);
   [ChromeEarlGrey tapWebViewElementWithID:@"pushStatePath"];
 
   [self assertStatusText:@"pushStatePath"
                  withURL:pushStatePathURL
               pageLoaded:NO];
 
@@ skipping 47 matching lines @@
       assertWithMatcher:grey_notNil()];
 }
 
 #pragma mark - Utility methods
 
 // Assert that status text |status| is displayed in the webview, that "onloaded"
 // text is displayed if pageLoaded is YES, and that the URL is as expected.
 - (void)assertStatusText:(NSString*)status
                  withURL:(const GURL&)urlToVerify
               pageLoaded:(BOOL)pageLoaded {
-  id<GREYMatcher> pageLoadedMatcher =
-      pageLoaded ? chrome_test_util::WebViewContainingText("onload")
-                 : chrome_test_util::WebViewNotContainingText("onload");
-  [[EarlGrey selectElementWithMatcher:pageLoadedMatcher]
-      assertWithMatcher:grey_notNil()];
+  if (pageLoaded) {
+    [ChromeEarlGrey waitForWebViewContainingText:@"onload"];
+  } else {
+    id<GREYMatcher> pageLoadedMatcher =
+        chrome_test_util::WebViewNotContainingText("onload");
+    [[EarlGrey selectElementWithMatcher:pageLoadedMatcher]
+        assertWithMatcher:grey_notNil()];
+  }
 
   if (status != NULL) {
     NSString* statusLabel = [NSString stringWithFormat:@"Action: %@", status];
-    [[EarlGrey
-        selectElementWithMatcher:chrome_test_util::WebViewContainingText(
-                                     base::SysNSStringToUTF8(statusLabel))]
-        assertWithMatcher:grey_notNil()];
+    [ChromeEarlGrey waitForWebViewContainingText:statusLabel];
   }
 
   [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                           urlToVerify.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 @end