Remove Earl Grey matcher APIs taking NSString.

ios/web/shell/test/earl_grey/shell_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>
 
 namespace web {
 
-// TODO(crbug.com/614167): Remove this method when it is no longer used.
-// Shorthand for GREYMatchers::matcherForWebViewContainingText.
-id<GREYMatcher> webViewContainingText(NSString* text);
-
-// TODO(crbug.com/614167): Remove this method when it is no longer used.
-// Shorthand for GREYMatchers::matcherForAddressFieldEqualToText.
-id<GREYMatcher> addressFieldText(NSString* text);
-
 // Shorthand for GREYMatchers::matcherForWebViewContainingText.
 id<GREYMatcher> webViewContainingText(const std::string& text);
 
 // Shorthand for GREYMatchers::matcherForAddressFieldEqualToText.
 id<GREYMatcher> addressFieldText(const std::string& text);
 
 // Shorthand for GREYMatchers::matcherForBackButton.
 id<GREYMatcher> backButton();
 
 // Shorthand for GREYMatchers::matcherForForwardButton.
@@ skipping 15 matching lines @@
 // Matcher for back button in web shell.
 + (id<GREYMatcher>)matcherForWebShellBackButton;
 
 // Matcher for forward button in web shell.
 + (id<GREYMatcher>)matcherForWebShellForwardButton;
 
 // Matcher for address field in web shell.
 + (id<GREYMatcher>)matcherForWebShellAddressField;
 
 @end