Create ChromeEarlGrey waitForWebViewContainingText.

ios/chrome/browser/web/window_open_by_dom_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/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 11 matching lines @@
 #include "ios/web/public/test/http_server/http_server_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 using chrome_test_util::AssertMainTabCount;
 using chrome_test_util::OmniboxText;
 using chrome_test_util::TapWebViewElementWithId;
-using chrome_test_util::WebViewContainingText;
 using web::test::HttpServer;
 
 namespace {
 // URL of the file-based page supporting these tests.
 const char kTestURL[] =
     "http://ios/testing/data/http_server_files/window_open.html";
 // Returns the text used for the blocked popup infobar when |blocked_count|
 // popups are blocked.
 NSString* GetBlockedPopupInfobarText(size_t blocked_count) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(
@@ skipping 16 matching lines @@
 
 + (void)tearDown {
   chrome_test_util::SetContentSettingsBlockPopups(CONTENT_SETTING_DEFAULT);
   [super tearDown];
 }
 
 - (void)setUp {
   [super setUp];
   // Open the test page. There should only be one tab open.
   [ChromeEarlGrey loadURL:HttpServer::MakeUrl(kTestURL)];
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText("Expected result")]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:"Expected result"];
   AssertMainTabCount(1);
 }
 
 // Tests that opening a link with target=_blank which then immediately closes
 // itself works.
 - (void)testLinkWithBlankTargetWithImmediateClose {
   TapWebViewElementWithId("webScenarioWindowOpenBlankTargetWithImmediateClose");
   AssertMainTabCount(1);
 }
 
 // Tests that sessionStorage content is available for windows opened by DOM via
 // target="_blank" links.
 - (void)testLinkWithBlankTargetSessionStorage {
   using chrome_test_util::ExecuteJavaScript;
 
   __unsafe_unretained NSError* error = nil;
   ExecuteJavaScript(@"sessionStorage.setItem('key', 'value');", &error);
   GREYAssert(!error, @"Error during script execution: %@", error);
 
   TapWebViewElementWithId("webScenarioWindowOpenSameURLWithBlankTarget");
   AssertMainTabCount(2);
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText("Expected result")]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:"Expected result"];
 
   id value = ExecuteJavaScript(@"sessionStorage.getItem('key');", &error);
   GREYAssert(!error, @"Error during script execution: %@", error);
   GREYAssert([value isEqual:@"value"], @"sessionStorage is not shared");
 }
 
 // Tests a link with target="_blank".
 - (void)testLinkWithBlankTarget {
   TapWebViewElementWithId("webScenarioWindowOpenRegularLink");
   AssertMainTabCount(2);
@@ skipping 117 matching lines @@
 - (void)testBlockPopupInjectedIntoOpenedWindow {
   chrome_test_util::SetContentSettingsBlockPopups(CONTENT_SETTING_BLOCK);
   TapWebViewElementWithId("webScenarioOpenWindowAndInjectPopup");
   NSString* infobarText = GetBlockedPopupInfobarText(1);
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(infobarText)]
       assertWithMatcher:grey_notNil()];
   AssertMainTabCount(2);
 }
 
 @end