Chromium Code Reviews| Index: ios/chrome/browser/ui/activity_services/activity_service_controller_egtest.mm |
| diff --git a/ios/chrome/browser/ui/activity_services/activity_service_controller_egtest.mm b/ios/chrome/browser/ui/activity_services/activity_service_controller_egtest.mm |
| index 1675a506dcd30bdb0911d026eae5e3ba536c1e15..0ed8d0cdca7f45a1fb1da2cc9c60617a1d6ba886 100644 |
| --- a/ios/chrome/browser/ui/activity_services/activity_service_controller_egtest.mm |
| +++ b/ios/chrome/browser/ui/activity_services/activity_service_controller_egtest.mm |
| @@ -25,7 +25,7 @@ namespace { |
| // Assert the activity service is visible by checking the "copy" button. |
| void AssertActivityServiceVisible() { |
| [[EarlGrey |
| - selectElementWithMatcher:chrome_test_util::buttonWithAccessibilityLabel( |
| + selectElementWithMatcher:chrome_test_util::ButtonWithAccessibilityLabel( |
| @"Copy")] |
| assertWithMatcher:grey_interactable()]; |
| } |
| @@ -34,13 +34,13 @@ void AssertActivityServiceVisible() { |
| void AssertActivityServiceNotVisible() { |
| [[EarlGrey |
| selectElementWithMatcher: |
| - grey_allOf(chrome_test_util::buttonWithAccessibilityLabel(@"Copy"), |
| + grey_allOf(chrome_test_util::ButtonWithAccessibilityLabel(@"Copy"), |
| grey_interactable(), nil)] assertWithMatcher:grey_nil()]; |
| } |
| // Returns a button with a print label. |
| -id<GREYMatcher> printButton() { |
| - return chrome_test_util::buttonWithAccessibilityLabel(@"Print"); |
| +id<GREYMatcher> PrintButton() { |
| + return chrome_test_util::ButtonWithAccessibilityLabel(@"Print"); |
| } |
| } // namespace |
| @@ -68,16 +68,16 @@ id<GREYMatcher> printButton() { |
| // Open an error page. |
| [ChromeEarlGrey loadURL:ErrorPageResponseProvider::GetDnsFailureUrl()]; |
| [[EarlGrey selectElementWithMatcher:chrome_test_util:: |
| - webViewBelongingToWebController()] |
| + WebViewBelongingToWebController()] |
|
Eugene But (OOO till 7-30)
2017/01/23 19:39:03
Please use WebViewInWebState instead.
baxley
2017/01/24 22:18:49
Done.
|
| assertWithMatcher:grey_nil()]; |
| NSString* const kError = |
| l10n_util::GetNSString(IDS_ERRORPAGES_HEADING_NOT_AVAILABLE); |
| [[EarlGrey |
| - selectElementWithMatcher:chrome_test_util::staticHtmlViewContainingText( |
| + selectElementWithMatcher:chrome_test_util::StaticHtmlViewContainingText( |
| kError)] assertWithMatcher:grey_notNil()]; |
| // Execute the Print action. |
| - [[EarlGrey selectElementWithMatcher:printButton()] performAction:grey_tap()]; |
| + [[EarlGrey selectElementWithMatcher:PrintButton()] performAction:grey_tap()]; |
| // Verify that a toast notification appears. |
| [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel( |
| @@ -100,7 +100,7 @@ id<GREYMatcher> printButton() { |
| // Verify that you can share, but that the Print action is not available. |
| [ChromeEarlGreyUI openShareMenu]; |
| AssertActivityServiceVisible(); |
| - [[EarlGrey selectElementWithMatcher:printButton()] |
| + [[EarlGrey selectElementWithMatcher:PrintButton()] |
| assertWithMatcher:grey_nil()]; |
| } |
| @@ -112,7 +112,7 @@ id<GREYMatcher> printButton() { |
| if (IsCompact()) { |
| [ChromeEarlGreyUI openToolsMenu]; |
| } |
| - id<GREYMatcher> share_button = chrome_test_util::shareButton(); |
| + id<GREYMatcher> share_button = chrome_test_util::ShareButton(); |
| [[EarlGrey selectElementWithMatcher:share_button] |
| assertWithMatcher:grey_accessibilityTrait( |
| UIAccessibilityTraitNotEnabled)]; |
| @@ -131,12 +131,12 @@ id<GREYMatcher> printButton() { |
| // Verify that the share menu is up and contains a Print action. |
| AssertActivityServiceVisible(); |
| - [[EarlGrey selectElementWithMatcher:printButton()] |
| + [[EarlGrey selectElementWithMatcher:PrintButton()] |
| assertWithMatcher:grey_interactable()]; |
| // Start the Copy action and verify that the share menu gets dismissed. |
| [[EarlGrey |
| - selectElementWithMatcher:chrome_test_util::buttonWithAccessibilityLabel( |
| + selectElementWithMatcher:chrome_test_util::ButtonWithAccessibilityLabel( |
| @"Copy")] performAction:grey_tap()]; |
| AssertActivityServiceNotVisible(); |
| } |