Index: ios/web/shell/test/earl_grey/shell_matchers.mm |
diff --git a/ios/web/shell/test/earl_grey/shell_matchers.mm b/ios/web/shell/test/earl_grey/shell_matchers.mm |
index 88e6e1222014c38f82c679367efa5746970ca771..944608e10526b61f5c21d7ffe818367ee704ecfa 100644 |
--- a/ios/web/shell/test/earl_grey/shell_matchers.mm |
+++ b/ios/web/shell/test/earl_grey/shell_matchers.mm |
@@ -6,6 +6,7 @@ |
#import "base/mac/foundation_util.h" |
#include "base/strings/sys_string_conversions.h" |
+#import "ios/testing/earl_grey/matchers.h" |
#include "ios/testing/earl_grey/wait_util.h" |
#import "ios/web/public/web_state/web_state.h" |
#import "ios/web/public/test/earl_grey/web_view_matchers.h" |
@@ -14,21 +15,25 @@ |
namespace web { |
-id<GREYMatcher> webViewContainingText(std::string text) { |
+id<GREYMatcher> webViewContainingText(const std::string& text) { |
WebState* web_state = shell_test_util::GetCurrentWebState(); |
return webViewContainingText(std::move(text), web_state); |
} |
-id<GREYMatcher> webViewCssSelector(std::string selector) { |
+id<GREYMatcher> webViewCssSelector(const std::string& selector) { |
WebState* web_state = shell_test_util::GetCurrentWebState(); |
return webViewCssSelector(std::move(selector), web_state); |
} |
+id<GREYMatcher> webView() { |
+ return webViewInWebState(shell_test_util::GetCurrentWebState()); |
+} |
+ |
id<GREYMatcher> webViewScrollView() { |
return webViewScrollView(shell_test_util::GetCurrentWebState()); |
} |
-id<GREYMatcher> addressFieldText(std::string text) { |
+id<GREYMatcher> addressFieldText(const std::string& text) { |
Eugene But (OOO till 7-30)
2016/08/31 15:27:59
This is going to break tests
|
MatchesBlock matches = ^BOOL(UIView* view) { |
if (![view isKindOfClass:[UITextField class]]) { |
return NO; |