Change iOS web matcher argument types to std::string.

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 ae9c30da33f69ed8a6d74dbb667e4231cc696c7e..0cdac9609323aea6edeb3fc8bdad887891d00ec6 100644
--- a/ios/web/shell/test/earl_grey/shell_matchers.h
+++ b/ios/web/shell/test/earl_grey/shell_matchers.h
@@ -2,16 +2,26 @@
 // 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();
 
@@ -26,10 +36,10 @@ id<GREYMatcher> addressField();
 @interface GREYMatchers (WebShellAdditions)
 
 // Matcher for WKWebView containing |text|.
-+ (id<GREYMatcher>)matcherForWebViewContainingText:(NSString*)text;
++ (id<GREYMatcher>)matcherForWebViewContainingText:(std::string)text;

[Eugene But (OOO till 7-30), 2016/05/24 01:20:31]

const std::string&

[baxley, 2016/05/24 13:12:00]

Done.

 
 // Matcher for web shell address field text property equal to |text|.
-+ (id<GREYMatcher>)matcherForAddressFieldEqualToText:(NSString*)text;
++ (id<GREYMatcher>)matcherForAddressFieldEqualToText:(std::string)text;

[Eugene But (OOO till 7-30), 2016/05/24 01:20:31]

const std::string&

[baxley, 2016/05/24 13:12:00]

Done.

 
 // Matcher for back button in web shell.
 + (id<GREYMatcher>)matcherForWebShellBackButton;