Remove matcher to wait for static HTML view.

ios/chrome/browser/web/navigation_egtest.mm

Index: ios/chrome/browser/web/navigation_egtest.mm
diff --git a/ios/chrome/browser/web/navigation_egtest.mm b/ios/chrome/browser/web/navigation_egtest.mm
index 9f967ed4124e4328cbec7e3d3d25756726f14753..eb477d929d7f78def70fcfcafdf07a57ac1142d3 100644
--- a/ios/chrome/browser/web/navigation_egtest.mm
+++ b/ios/chrome/browser/web/navigation_egtest.mm
@@ -102,20 +102,6 @@ void SetupBackAndForwardResponseProvider() {
   web::test::SetUpSimpleHttpServer(responses);
 }
 
-// Matcher for the error page.
-// TODO(crbug.com/638674): Evaluate if this can move to shared code. See
-// ios/chrome/browser/ui/error_page_egtest.mm.
-id<GREYMatcher> ErrorPage() {
-  NSString* const kDNSError =
-      l10n_util::GetNSString(IDS_ERRORPAGES_HEADING_NOT_AVAILABLE);
-  NSString* const kInternetDisconnectedError =
-      l10n_util::GetNSString(IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED);

[baxley, 2017/03/31 20:59:22]

I chatted with kkhorimoto@ and he thought it was reasonable to remove the check
for IDS_ERROR_PAGES_HEADING_INTERNET_DISCONNECTED, when looking for an error
page. The thought was the test should be hitting *HEADING_NOT_AVAILABLE, and if
it's getting a WiFi problem then it should be handled differently.

-  return grey_anyOf(chrome_test_util::StaticHtmlViewContainingText(kDNSError),
-                    chrome_test_util::StaticHtmlViewContainingText(
-                        kInternetDisconnectedError),
-                    nil);
-}
-
 // URLs for server redirect tests.
 const char kRedirectIndexURL[] = "http://redirect";
 const char kRedirect301URL[] = "http://redirect/redirect?code=301";
@@ -437,8 +423,7 @@ class RedirectResponseProvider : public web::DataResponseProvider {
   // page not available error.
   const GURL badURL("http://www.badurljkljkljklfloofy.com");
   [ChromeEarlGrey loadURL:badURL];
-  [[EarlGrey selectElementWithMatcher:ErrorPage()]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForErrorPage];
 
   // Go back to page 1 by clicking back button.
   [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
@@ -449,8 +434,7 @@ class RedirectResponseProvider : public web::DataResponseProvider {
   // Go forward to page 2 by calling window.history.forward() and assert that
   // the error page is shown.
   TapWebViewElementWithId(kForwardHTMLButtonLabel);
-  [[EarlGrey selectElementWithMatcher:ErrorPage()]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForErrorPage];
 }
 
 #pragma mark window.location.hash operations