[ios] Matcher for a generic interstitial page.

ios/web/public/test/earl_grey/web_view_matchers.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 "ios/web/public/test/earl_grey/web_view_matchers.h"
 
 #import <WebKit/WebKit.h>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/strings/stringprintf.h"
@@ skipping 156 matching lines @@
 
   DescribeToBlock describe = ^(id<GREYDescription> description) {
     [description appendText:@"web view scroll view"];
   };
 
   return [[[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
                                                descriptionBlock:describe]
       autorelease];
 }
 
+id<GREYMatcher> interstitial(WebState* web_state) {
+  MatchesBlock matches = ^BOOL(WKWebView* view) {
+    web::WebInterstitialImpl* interstitial =
+        static_cast<web::WebInterstitialImpl*>(web_state->GetWebInterstitial());
+    return interstitial &&
+           [view isDescendantOfView:interstitial->GetContentView()];
+  };
+
+  DescribeToBlock describe = ^(id<GREYDescription> description) {
+    [description appendText:@"interstitial displayed"];
+  };
+
+  return grey_allOf(webViewInWebState(web_state),
+                    [[[GREYElementMatcherBlock alloc]
+                        initWithMatchesBlock:matches
+                            descriptionBlock:describe] autorelease],
+                    nil);
+}
+
 id<GREYMatcher> interstitialContainingText(NSString* text,
                                            WebState* web_state) {
   MatchesBlock matches = ^BOOL(WKWebView* view) {
     return WaitUntilConditionOrTimeout(testing::kWaitForUIElementTimeout, ^{
-      web::WebInterstitialImpl* interstitial =
-          static_cast<web::WebInterstitialImpl*>(
-              web_state->GetWebInterstitial());
-      if (![view isDescendantOfView:interstitial->GetContentView()])
-        return false;
-
       NSString* script = base::SysUTF8ToNSString(kGetDocumentBodyJavaScript);
       id body = ExecuteScriptOnInterstitial(web_state, script);
       return [body containsString:text] ? true : false;
     });
   };
 
   DescribeToBlock describe = ^(id<GREYDescription> description) {
     [description appendText:@"interstitial containing "];
     [description appendText:text];
   };
 
-  return grey_allOf(webViewInWebState(web_state),
+  return grey_allOf(interstitial(web_state),
                     [[[GREYElementMatcherBlock alloc]
                         initWithMatchesBlock:matches
                             descriptionBlock:describe] autorelease],
                     nil);
 }
 
 }  // namespace web