Create ChromeEarlGrey waitForWebViewContainingText.

ios/chrome/browser/web/browsing_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 <map>
 #include <memory>
 #include <string>
 
 #include "base/ios/ios_util.h"
@@ skipping 18 matching lines @@
 #import "ios/web/public/test/earl_grey/web_view_actions.h"
 #import "ios/web/public/test/earl_grey/web_view_matchers.h"
 #import "ios/web/public/test/http_server.h"
 #include "ios/web/public/test/http_server_util.h"
 #include "ios/web/public/test/response_providers/data_response_provider.h"
 #include "net/http/http_response_headers.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 using chrome_test_util::OmniboxText;
-using chrome_test_util::WebViewContainingText;
 
 namespace {
 
 // URL used for the reload test.
 const char kReloadTestUrl[] = "http://mock/reloadTest";
 
 // Returns the number of serviced requests in HTTP body.
 class ReloadResponseProvider : public web::DataResponseProvider {
  public:
   ReloadResponseProvider() : request_number_(0) {}
@@ skipping 85 matching lines @@
 
 // Tests that page successfully reloads.
 - (void)testReload {
   // Set up test HTTP server responses.
   std::unique_ptr<web::DataResponseProvider> provider(
       new ReloadResponseProvider());
   web::test::SetUpHttpServer(std::move(provider));
 
   GURL URL = ReloadResponseProvider::GetReloadTestUrl();
   [ChromeEarlGrey loadURL:URL];
-  std::string expectedBodyBeforeReload(
+
+  NSString* expectedBodyBeforeReload = base::SysUTF8ToNSString(
       ReloadResponseProvider::GetResponseBody(0 /* request number */));
-  [[EarlGrey
-      selectElementWithMatcher:WebViewContainingText(expectedBodyBeforeReload)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:expectedBodyBeforeReload];
 
   [ChromeEarlGreyUI reload];
-  std::string expectedBodyAfterReload(
+  NSString* expectedBodyAfterReload = base::SysUTF8ToNSString(
       ReloadResponseProvider::GetResponseBody(1 /* request_number */));
-  [[EarlGrey
-      selectElementWithMatcher:WebViewContainingText(expectedBodyAfterReload)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:expectedBodyAfterReload];
 }
 
 // Tests that a tab's title is based on the URL when no other information is
 // available.
 - (void)testBrowsingTabTitleSetFromURL {
   if (!IsIPadIdiom()) {
     EARL_GREY_TEST_SKIPPED(@"Tab Title not displayed on handset.");
   }
 
   web::test::SetUpFileBasedHttpServer();
@@ skipping 256 matching lines @@
 
   [ChromeEarlGrey loadURL:URL];
 
   // Tap on chrome://version link.
   [ChromeEarlGrey tapWebViewElementWithID:@"link"];
 
   // Verify that page did not change by checking its URL and message printed by
   // onclick event.
   [[EarlGrey selectElementWithMatcher:OmniboxText("chrome://version")]
       assertWithMatcher:grey_nil()];
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText("Hello world!")]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:@"Hello world!"];
 
   // Verify that no new tabs were open which could load chrome://version.
   chrome_test_util::AssertMainTabCount(1U);
 }
 
 // Tests that pressing the button on a POST-based form with same-page action
 // does not change the page and that the back button works as expected
 // afterwards.
 - (void)testBrowsingPostToSamePage {
   // Create map of canned responses and set up the test HTML server.
@@ skipping 85 matching lines @@
 
   [ChromeEarlGrey loadURL:firstURL];
   [ChromeEarlGrey loadURL:secondURL];
 
   // Execute some JavaScript in the omnibox.
   [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
       performAction:grey_typeText(@"javascript:document.write('foo')")];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Go")]
       performAction:grey_tap()];
 
-  id<GREYMatcher> webView = chrome_test_util::WebViewContainingText("foo");
-  [[EarlGrey selectElementWithMatcher:webView] assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:@"foo"];
 
   // Verify that the JavaScript did not affect history by going back and then
   // forward again.
   [self goBack];
   [[EarlGrey selectElementWithMatcher:OmniboxText(firstURL.GetContent())]
       assertWithMatcher:grey_notNil()];
   [self goForward];
   [[EarlGrey selectElementWithMatcher:OmniboxText(secondURL.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
@@ skipping 66 matching lines @@
       "<form action='%s' method='post'>"
       "<input value='textfield' id='textfield' type='text'></label>"
       "<input type='submit'></form>",
       destinationURL.spec().c_str());
   // This is the page that should be showing at the end of the test.
   responses[destinationURL] = "baz!";
   web::test::SetUpSimpleHttpServer(responses);
 
   // Open the URL, focus the textfield,and submit via keyboard.
   [ChromeEarlGrey loadURL:URL];
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText("hello!")]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:@"hello!"];
 
   [self submitFormUsingKeyboardGoButtonWithInputID:"textfield"];
 
   // Verify that the browser navigates to the expected URL.
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText("baz!")]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:@"baz!"];
   [[EarlGrey selectElementWithMatcher:OmniboxText(destinationURL.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Go back and verify that the browser navigates to the original URL.
   [self goBack];
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText("hello!")]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:@"hello!"];
   [[EarlGrey selectElementWithMatcher:OmniboxText(URL.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 @end