[ios] Cleaned up web EG matchers.

ios/web/public/test/earl_grey/web_view_matchers.h

 // 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 <string>
 
 #import <EarlGrey/EarlGrey.h>
 
 #import "ios/web/public/web_state/web_state.h"
 
 namespace web {
 
-// Shorthand for GREYMatchers::matcherForWebViewInWebState.
-id<GREYMatcher> webViewInWebState(web::WebState* webState);
+// Matcher for WKWebView which belogs to the given |webState|.
+id<GREYMatcher> webViewInWebState(WebState* web_state);
 
-// Shorthand for GREYMatchers::matcherForWebViewContainingText:inWebState.
-id<GREYMatcher> webViewContainingText(const std::string& text,
-                                      web::WebState* webState);
+// Matcher for WKWebView containing |text|.
+id<GREYMatcher> webViewContainingText(std::string text, WebState* web_state);
 
-// Shorthand for GREYMatchers::matcherForWebWithCSSSelector:inWebState.
-id<GREYMatcher> webViewCssSelector(const std::string& selector,
-                                   web::WebState* webState);
+// Matcher for WKWebView containing an html element which matches |selector|.
+id<GREYMatcher> webViewCssSelector(std::string selector, WebState* web_state);
 
-// Shorthand for GREYMatchers::matcherForWebViewScrollViewInWebState.
-id<GREYMatcher> webViewScrollView(web::WebState* webState);
+// Matcher for WKWebView's scroll view.
+id<GREYMatcher> webViewScrollView(WebState* web_state);
 
 }  // namespace web
-
-@interface GREYMatchers (WebViewAdditions)
-
-// Matcher for WKWebView which belogs to the given |webState|.
-+ (id<GREYMatcher>)matcherForWebViewInWebState:(web::WebState*)webState;
-
-// Matcher for WKWebView containing |text|.
-+ (id<GREYMatcher>)matcherForWebViewContainingText:(const std::string&)text
-                                        inWebState:(web::WebState*)webState;
-
-// Matcher for WKWebView containing an html element which matches |selector|.
-+ (id<GREYMatcher>)matcherForWebWithCSSSelector:(const std::string&)selector
-                                     inWebState:(web::WebState*)webState;
-
-// Matcher for WKWebView's scroll view.
-+ (id<GREYMatcher>)matcherForWebViewScrollViewInWebState:
-    (web::WebState*)webState;
-
-@end