Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: ios/chrome/browser/ui/tools_menu/tools_popup_menu_egtest.mm

Issue 2642193012: Make EarlGrey matchers compliant with Chromium style. (Closed)
Patch Set: build.gn and rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/ui/toolbar/toolbar_egtest.mm ('k') | ios/chrome/browser/ui/webui/web_ui_egtest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/tools_menu/tools_popup_menu_egtest.mm
diff --git a/ios/chrome/browser/ui/tools_menu/tools_popup_menu_egtest.mm b/ios/chrome/browser/ui/tools_menu/tools_popup_menu_egtest.mm
index 9352bf30f568d723bedd9cd30d7858c0cbb48bb2..e2300f66fcf6fb6abf3023fec26cc53d78e400fc 100644
--- a/ios/chrome/browser/ui/tools_menu/tools_popup_menu_egtest.mm
+++ b/ios/chrome/browser/ui/tools_menu/tools_popup_menu_egtest.mm
@@ -57,7 +57,7 @@ class UserAgentResponseProvider : public web::DataResponseProvider {
// Matcher for the button to find in page.
id<GREYMatcher> FindInPageButton() {
- return chrome_test_util::buttonWithAccessibilityLabel(
+ return chrome_test_util::ButtonWithAccessibilityLabel(
l10n_util::GetNSStringWithFixup(IDS_IOS_TOOLS_MENU_FIND_IN_PAGE));
}
@@ -66,11 +66,6 @@ id<GREYMatcher> RequestDesktopButton() {
return grey_accessibilityID(kToolsMenuRequestDesktopId);
}
-// Matcher for the navigate backward button.
-id<GREYMatcher> BackButton() {
- return chrome_test_util::buttonWithAccessibilityLabelId(IDS_ACCNAME_BACK);
-}
-
const char kPDFURL[] = "http://ios/testing/data/http_server_files/testpage.pdf";
} // namespace
@@ -91,7 +86,7 @@ const char kPDFURL[] = "http://ios/testing/data/http_server_files/testpage.pdf";
// Verify initial reception of the mobile site.
[[EarlGrey
- selectElementWithMatcher:chrome_test_util::webViewContainingText(
+ selectElementWithMatcher:chrome_test_util::WebViewContainingText(
base::SysNSStringToUTF8(kMobileSiteLabel))]
assertWithMatcher:grey_notNil()];
@@ -100,14 +95,15 @@ const char kPDFURL[] = "http://ios/testing/data/http_server_files/testpage.pdf";
[[EarlGrey selectElementWithMatcher:RequestDesktopButton()]
performAction:grey_tap()];
[[EarlGrey
- selectElementWithMatcher:chrome_test_util::webViewContainingText(
+ selectElementWithMatcher:chrome_test_util::WebViewContainingText(
base::SysNSStringToUTF8(kDesktopSiteLabel))]
assertWithMatcher:grey_notNil()];
// Verify that going back returns to the mobile site.
- [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
+ [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()]
+ performAction:grey_tap()];
[[EarlGrey
- selectElementWithMatcher:chrome_test_util::webViewContainingText(
+ selectElementWithMatcher:chrome_test_util::WebViewContainingText(
base::SysNSStringToUTF8(kMobileSiteLabel))]
assertWithMatcher:grey_notNil()];
}
@@ -122,7 +118,7 @@ const char kPDFURL[] = "http://ios/testing/data/http_server_files/testpage.pdf";
IDS_IOS_TOOLBAR_CLOSE_MENU))]
performAction:grey_tap()];
} else {
- [[EarlGrey selectElementWithMatcher:chrome_test_util::toolsMenuButton()]
+ [[EarlGrey selectElementWithMatcher:chrome_test_util::ToolsMenuButton()]
performAction:grey_tap()];
}
« no previous file with comments | « ios/chrome/browser/ui/toolbar/toolbar_egtest.mm ('k') | ios/chrome/browser/ui/webui/web_ui_egtest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698