Chromium Code Reviews| 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..2c384e02fa4bce8def3003c57edb073fc52bed05 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)); |
| } |
| @@ -68,7 +68,7 @@ id<GREYMatcher> RequestDesktopButton() { |
| // Matcher for the navigate backward button. |
| id<GREYMatcher> BackButton() { |
| - return chrome_test_util::buttonWithAccessibilityLabelId(IDS_ACCNAME_BACK); |
| + return chrome_test_util::ButtonWithAccessibilityLabelId(IDS_ACCNAME_BACK); |
|
Eugene But (OOO till 7-30)
2017/01/23 19:39:04
Could you please use existing matcher from chrome_
baxley
2017/01/24 22:18:49
Done.
|
| } |
| const char kPDFURL[] = "http://ios/testing/data/http_server_files/testpage.pdf"; |
| @@ -91,7 +91,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 +100,14 @@ 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::webViewContainingText( |
| + selectElementWithMatcher:chrome_test_util::WebViewContainingText( |
| base::SysNSStringToUTF8(kMobileSiteLabel))] |
| assertWithMatcher:grey_notNil()]; |
| } |
| @@ -122,7 +122,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()]; |
| } |