Create ChromeEarlGrey waitForWebViewContainingText.

ios/chrome/browser/ui/webui/web_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 <XCTest/XCTest.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
@@ skipping 12 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "url/scheme_host_port.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 using chrome_test_util::BackButton;
 using chrome_test_util::ForwardButton;
 using chrome_test_util::TapWebViewElementWithId;
-using chrome_test_util::WebViewContainingText;
 
 namespace {
 
 // Loads WebUI page with given |host|.
 void LoadWebUIUrl(const std::string& host) {
   GURL web_ui_url(url::SchemeHostPort(kChromeUIScheme, host, 0).Serialize());
   [ChromeEarlGrey loadURL:web_ui_url];
 }
 
 // Adds wait for omnibox text matcher so that omnibox text can be updated.
@@ skipping 34 matching lines @@
 @end
 
 @implementation WebUITestCase
 
 // Tests that chrome://version renders and contains correct version number and
 // user agent string.
 - (void)testVersion {
   LoadWebUIUrl(kChromeUIVersionHost);
 
   // Verify that app version is present on the page.
-  const std::string version = version_info::GetVersionNumber();
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText(version)]
-      assertWithMatcher:grey_notNil()];
+  NSString* version = base::SysUTF8ToNSString(version_info::GetVersionNumber());
+  [ChromeEarlGrey waitForWebViewContainingText:version];
 
   // Verify that mobile User Agent string is present on the page.
-  const std::string userAgent =
-      web::GetWebClient()->GetUserAgent(web::UserAgentType::MOBILE);
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText(userAgent)]
-      assertWithMatcher:grey_notNil()];
+  NSString* userAgent = base::SysUTF8ToNSString(
+      web::GetWebClient()->GetUserAgent(web::UserAgentType::MOBILE));
+  [ChromeEarlGrey waitForWebViewContainingText:userAgent];
 }
 
 // Tests that chrome://physical-web renders and the page title is present.
 - (void)testPhysicalWeb {
   // Enable the Physical Web via Chrome variation.
   base::FieldTrialList::CreateFieldTrial("PhysicalWebEnabled", "Enabled");
 
   LoadWebUIUrl(kChromeUIPhysicalWebHost);
 
   // Verify that the title string is present on the page.
-  std::string pageTitle = l10n_util::GetStringUTF8(IDS_PHYSICAL_WEB_UI_TITLE);
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText(pageTitle)]
-      assertWithMatcher:grey_notNil()];
+  NSString* pageTitle = l10n_util::GetNSString(IDS_PHYSICAL_WEB_UI_TITLE);
+  [ChromeEarlGrey waitForWebViewContainingText:pageTitle];
 }
 
 // Tests that clicking on a link for a native page from chrome://chrome-urls
 // navigates to that page.
 - (void)testChromeURLNavigateToNativePage {
   LoadWebUIUrl(kChromeUIChromeURLsHost);
 
   // Tap on chrome://terms link on the page.
   chrome_test_util::TapWebViewElementWithId(kChromeUITermsHost);
 
   // Verify that the resulting page is chrome://terms.
   [[EarlGrey selectElementWithMatcher:WaitForOmniboxText("chrome://terms")]
       assertWithMatcher:grey_sufficientlyVisible()];
   NSString* kTermsText = @"Google Chrome Terms of Service";
   [ChromeEarlGrey waitForStaticHTMLViewContainingText:kTermsText];
 }
 
 // Tests that back navigation functions properly after navigation via anchor
 // click.
 - (void)testChromeURLBackNavigationFromAnchorClick {
   LoadWebUIUrl(kChromeUIChromeURLsHost);
 
   // Tap on chrome://version link on the page.
   chrome_test_util::TapWebViewElementWithId(kChromeUIVersionHost);
 
   // Verify that the resulting page is chrome://version.
   [[EarlGrey selectElementWithMatcher:WaitForOmniboxText("chrome://version")]
       assertWithMatcher:grey_sufficientlyVisible()];
-  const std::string kAuthorsText = "The Chromium Authors";
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kAuthorsText)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:@"The Chromium Authors"];
 
   // Tap the back button in the toolbar and verify that the resulting page is
   // the previously visited page chrome://chrome-urls.
   [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [[EarlGrey
       selectElementWithMatcher:WaitForOmniboxText("chrome://chrome-urls")]
       assertWithMatcher:grey_sufficientlyVisible()];
-  const std::string kChromeURLsText = "List of Chrome URLs";
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kChromeURLsText)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:@"List of Chrome URLs"];
 }
 
 // Tests that back and forward navigation between chrome URLs functions
 // properly.
 - (void)testChromeURLBackAndForwardNavigation {
   // Navigate to the first URL chrome://version.
   LoadWebUIUrl(kChromeUIVersionHost);
 
   // Navigate to the second URL chrome://flags.
   LoadWebUIUrl(kChromeUIFlagsHost);
@@ skipping 50 matching lines @@
   [[EarlGrey selectElementWithMatcher:WaitForOmniboxText(kChromeInvalidURL)]
       assertWithMatcher:grey_sufficientlyVisible()];
   NSString* kError =
       l10n_util::GetNSString(IDS_ERRORPAGES_HEADING_NOT_AVAILABLE);
   id<GREYMatcher> messageMatcher = [GREYMatchers matcherForText:kError];
   [[EarlGrey selectElementWithMatcher:messageMatcher]
       assertWithMatcher:grey_notNil()];
 }
 
 @end