Refactor web shell integration tests utilities.

ios/web/shell/test/web_view_matchers.mm

Index: ios/web/shell/test/web_view_matchers.mm
diff --git a/ios/web/shell/test/web_view_matchers.mm b/ios/web/shell/test/web_view_matchers.mm
deleted file mode 100644
index eb40c310e1df1a445fa1a019e2204f2a16bd467c..0000000000000000000000000000000000000000
--- a/ios/web/shell/test/web_view_matchers.mm
+++ /dev/null
@@ -1,82 +0,0 @@
-// 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/shell/test/web_view_matchers.h"
-
-#import <WebKit/WebKit.h>
-
-#include "base/mac/bind_objc_block.h"
-#include "base/strings/sys_string_conversions.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/test/ios/wait_util.h"
-#include "base/values.h"
-#include "ios/web/public/web_state/web_state.h"
-#include "ios/web/shell/test/navigation_test_util.h"
-#include "ios/web/shell/test/web_shell_test_util.h"
-
-namespace {
-
-// Constant for UI wait loop in seconds.
-const NSTimeInterval kSpinDelaySeconds = 0.01;
-
-// Constant for timeout in seconds while waiting for web element.
-const NSTimeInterval kWaitForWebElementTimeout = 4.0;
-
-// Script that returns document.body as a string.
-char kGetDocumentBodyJavaScript[] =
-    "document.body ? document.body.textContent : null";
-}
-
-namespace web {
-
-id<GREYMatcher> webViewContainingText(NSString* text) {
-  return [GREYMatchers matcherForWebViewContainingText:text];
-}
-
-}  // namespace web
-
-@implementation GREYMatchers (WebViewAdditions)
-
-+ (id<GREYMatcher>)matcherForWebViewContainingText:(NSString*)text {
-  MatchesBlock matches = ^BOOL(UIView* view) {

[Eugene But (OOO till 7-30), 2016/05/05 18:01:11]

Why removing this? You can jus call matcherForWebViewContainingText:inWebView...

[baxley, 2016/05/05 18:33:18]

Moving it to ios/web/public/test/earl_grey.

I guess what you're suggesting is to keep this method to simply find the
WebState then pass it to the method that takes the text and the WebState?

[Eugene But (OOO till 7-30), 2016/05/05 18:50:32]

Yes, sorry for being unclear. 

[baxley, 2016/05/05 21:13:53]

Done. Most of this method moved to ios/web/public/test/earl_grey, but I kept the
simple API in ios/web/shell/test/earl_grey/shell_matchers

-    if (![view isKindOfClass:[WKWebView class]]) {
-      return NO;
-    }
-
-    ViewController* viewController =
-        web::web_shell_test_util::GetCurrentViewController();
-    web::WebState* webState = [viewController webState];
-
-    __block BOOL didSucceed = NO;
-    NSDate* deadline =
-        [NSDate dateWithTimeIntervalSinceNow:kWaitForWebElementTimeout];
-    while (([[NSDate date] compare:deadline] != NSOrderedDescending) &&
-           !didSucceed) {
-      webState->ExecuteJavaScript(
-          base::UTF8ToUTF16(kGetDocumentBodyJavaScript),
-          base::BindBlock(^(const base::Value* value) {
-            std::string response;
-            if (value && value->IsType(base::Value::TYPE_STRING) &&
-                value->GetAsString(&response)) {
-              didSucceed = response.find(base::SysNSStringToUTF8(text)) !=
-                           std::string::npos;
-            }
-          }));
-      base::test::ios::SpinRunLoopWithMaxDelay(
-          base::TimeDelta::FromSecondsD(kSpinDelaySeconds));
-    }
-    return didSucceed;
-  };
-
-  DescribeToBlock describe = ^(id<GREYDescription> description) {
-    [description
-        appendText:[NSString stringWithFormat:@"web view containing %@", text]];
-  };
-
-  return [[[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
-                                               descriptionBlock:describe]
-      autorelease];
-}
-
-@end