Create ChromeEarlGrey waitForWebViewContainingText.

ios/web/shell/test/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 <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
 #import <XCTest/XCTest.h>
 
 #import <EarlGrey/EarlGrey.h>
 
-#include "base/strings/sys_string_conversions.h"
 #import "ios/web/public/test/http_server/http_server.h"
 #include "ios/web/public/test/http_server/http_server_util.h"
 #include "ios/web/shell/test/app/web_view_interaction_test_util.h"
 #import "ios/web/shell/test/earl_grey/shell_earl_grey.h"
 #import "ios/web/shell/test/earl_grey/shell_matchers.h"
 #import "ios/web/shell/test/earl_grey/web_shell_test_case.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
@@ skipping 20 matching lines @@
 
   [[EarlGrey selectElementWithMatcher:web::AddressFieldText("about:blank")]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests the back and forward button after entering two URLs.
 - (void)testNavigationBackAndForward {
   // Create map of canned responses and set up the test HTML server.
   std::map<GURL, std::string> responses;
   const GURL URL1 = web::test::HttpServer::MakeUrl("http://firstURL");
-  std::string response1 = "Test Page 1";
+  const char response1[] = "Test Page 1";
   responses[URL1] = response1;
 
   const GURL URL2 = web::test::HttpServer::MakeUrl("http://secondURL");
-  std::string response2 = "Test Page 2";
+  const char response2[] = "Test Page 2";
   responses[URL2] = response2;
 
   web::test::SetUpSimpleHttpServer(responses);
 
   [ShellEarlGrey loadURL:URL1];
   [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL1.spec())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:web::WebViewContainingText(response1)]
-      assertWithMatcher:grey_notNil()];
+  [ShellEarlGrey waitForWebViewContainingText:response1];
 
   [ShellEarlGrey loadURL:URL2];
   [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL2.spec())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:web::WebViewContainingText(response2)]
-      assertWithMatcher:grey_notNil()];
+  [ShellEarlGrey waitForWebViewContainingText:response2];
 
   [[EarlGrey selectElementWithMatcher:web::BackButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL1.spec())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:web::WebViewContainingText(response1)]
-      assertWithMatcher:grey_notNil()];
+  [ShellEarlGrey waitForWebViewContainingText:response1];
 
   [[EarlGrey selectElementWithMatcher:web::ForwardButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL2.spec())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:web::WebViewContainingText(response2)]
-      assertWithMatcher:grey_notNil()];
+  [ShellEarlGrey waitForWebViewContainingText:response2];
 }
 
 // Tests back and forward navigation where a fragment link is tapped.
 - (void)testNavigationBackAndForwardAfterFragmentLink {
   // Create map of canned responses and set up the test HTML server.
   std::map<GURL, std::string> responses;
   const GURL URL1 = web::test::HttpServer::MakeUrl("http://fragmentLink");
   const std::string response = "<a href='#hash' id='link'>link</a>";
   responses[URL1] = response;
 
@@ skipping 40 matching lines @@
   web::test::SetUpSimpleHttpServer(responses);
 
   [ShellEarlGrey loadURL:URL];
   [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL.spec())]
       assertWithMatcher:grey_notNil()];
 
   web::shell_test_util::TapWebViewElementWithId("overrides-href");
 
   [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL.spec())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey
-      selectElementWithMatcher:web::WebViewContainingText("Default prevented!")]
-      assertWithMatcher:grey_notNil()];
+  [ShellEarlGrey waitForWebViewContainingText:"Default prevented!"];
 }
 
 // Tests tapping on a link with unsupported URL scheme.
 - (void)testNavigationUnsupportedSchema {
   // Create map of canned responses and set up the test HTML server.
   std::map<GURL, std::string> responses;
   const GURL URL =
       web::test::HttpServer::MakeUrl("http://urlWithUnsupportedSchemeLink");
   const char pageHTML[] =
       "<script>"
       "  function printMsg() {"
       "    document.body.appendChild(document.createTextNode("
       "    'No navigation!'));"
       "  }"
       "</script>"
       "<a href='aaa://unsupported' id='link' "
       "onclick='printMsg();'>unsupportedScheme</a>";
   responses[URL] = pageHTML;
 
   web::test::SetUpSimpleHttpServer(responses);
 
   [ShellEarlGrey loadURL:URL];
   [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL.spec())]
       assertWithMatcher:grey_notNil()];
 
   web::shell_test_util::TapWebViewElementWithId("link");
 
   [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL.spec())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey
-      selectElementWithMatcher:web::WebViewContainingText("No navigation!")]
-      assertWithMatcher:grey_notNil()];
+  [ShellEarlGrey waitForWebViewContainingText:"No navigation!"];
 }
 
 @end