[ios] Cleaned up web EG matchers.

ios/web/shell/test/earl_grey/shell_matchers.h

Index: ios/web/shell/test/earl_grey/shell_matchers.h
diff --git a/ios/web/shell/test/earl_grey/shell_matchers.h b/ios/web/shell/test/earl_grey/shell_matchers.h
index 3158c9a196f75fb8f6c042e081157577b0503795..f458b8c60ad6f462b65e44c1724329b70de6e0cf 100644
--- a/ios/web/shell/test/earl_grey/shell_matchers.h
+++ b/ios/web/shell/test/earl_grey/shell_matchers.h
@@ -8,50 +8,25 @@
 
 namespace web {
 
-// Shorthand for GREYMatchers::matcherForWebViewContainingText.
-id<GREYMatcher> webViewContainingText(const std::string& text);
-
-// Shorthand for GREYMatchers::matcherForWebWithCSSSelector.
-id<GREYMatcher> webViewCssSelector(const std::string& selector);
-
-// Shorthand for GREYMatchers::matcherForWebViewScrollView.
-id<GREYMatcher> webViewScrollView();
-
-// Shorthand for GREYMatchers::matcherForAddressFieldEqualToText.
-id<GREYMatcher> addressFieldText(const std::string& text);
-
-// Shorthand for GREYMatchers::matcherForBackButton.
-id<GREYMatcher> backButton();
-
-// Shorthand for GREYMatchers::matcherForForwardButton.
-id<GREYMatcher> forwardButton();
-
-// Shorthand for GREYMatchers::matcherForAddressField.
-id<GREYMatcher> addressField();
-
-}  // namespace web
-
-@interface GREYMatchers (WebShellAdditions)
-
 // Matcher for WKWebView containing |text|.
-+ (id<GREYMatcher>)matcherForWebViewContainingText:(const std::string&)text;
+id<GREYMatcher> webViewContainingText(std::string text);
 
 // Matcher for WKWebView containing an html element which matches |selector|.
-+ (id<GREYMatcher>)matcherForWebWithCSSSelector:(const std::string&)selector;
+id<GREYMatcher> webViewCssSelector(std::string selector);
 
 // Matcher for WKWebView's scroll view.
-+ (id<GREYMatcher>)matcherForWebViewScrollView;
+id<GREYMatcher> webViewScrollView();
 
 // Matcher for web shell address field text property equal to |text|.
-+ (id<GREYMatcher>)matcherForAddressFieldEqualToText:(const std::string&)text;
+id<GREYMatcher> addressFieldText(std::string text);
 
 // Matcher for back button in web shell.
-+ (id<GREYMatcher>)matcherForWebShellBackButton;
+id<GREYMatcher> backButton();
 
 // Matcher for forward button in web shell.
-+ (id<GREYMatcher>)matcherForWebShellForwardButton;
+id<GREYMatcher> forwardButton();
 
 // Matcher for address field in web shell.
-+ (id<GREYMatcher>)matcherForWebShellAddressField;
+id<GREYMatcher> addressField();
 
-@end
+}  // namespace web