Make settings_egtest.mm work in landscape on small phones.

ios/chrome/browser/ui/settings/settings_egtest.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <EarlGrey/EarlGrey.h>
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 144 matching lines @@
   return ButtonWithAccessibilityLabelId(IDS_IOS_BLOCK_POPUPS);
 }
 // Matcher for the Privacy Translate Settings button on the privacy UI.
 id<GREYMatcher> TranslateSettingsButton() {
   return ButtonWithAccessibilityLabelId(IDS_IOS_TRANSLATE_SETTING);
 }
 // Matcher for the save button in the save password bar.
 id<GREYMatcher> SavePasswordButton() {
   return ButtonWithAccessibilityLabelId(IDS_IOS_PASSWORD_MANAGER_SAVE_BUTTON);
 }
+// Matcher for the Content Settings button on the main Settings screen.
+id<GREYMatcher> ContentSettingsButton() {
+  return ButtonWithAccessibilityLabelId(IDS_IOS_CONTENT_SETTINGS_TITLE);
+}
+// Matcher for the Bandwidth Settings button on the main Settings screen.
+id<GREYMatcher> BandwidthSettingsButton() {
+  return ButtonWithAccessibilityLabelId(IDS_IOS_BANDWIDTH_MANAGEMENT_SETTINGS);
+}
 
 // Run as a task to check if a certificate has been added to the ChannelIDStore.
 // Signals the given |semaphore| if the cert was added, or reposts itself
 // otherwise.
 void CheckCertificate(scoped_refptr<net::URLRequestContextGetter> getter,
                       dispatch_semaphore_t semaphore) {
   net::ChannelIDService* channel_id_service =
       getter->GetURLRequestContext()->channel_id_service();
   if (channel_id_service->channel_id_count() == 0) {
     // If the channel_id_count is still 0, no certs have been added yet.
@@ skipping 62 matching lines @@
 }
 
 }  // namespace
 
 // Settings tests for Chrome.
 @interface SettingsTestCase : ChromeTestCase
 @end
 
 @implementation SettingsTestCase
 
-// Opens the a submenu from the settings page.  Must be called from the NTP.
-// TODO(crbug.com/684619): Investigate why usingSearchAction doesn't scroll
-// until the bottom.
-- (void)openSubSettingMenu:(id<GREYMatcher>)settingToTap {
-  const CGFloat kScrollDisplacement = 150.0;
-  id<GREYMatcher> settingsCollectionViewMatcher =
-      grey_accessibilityID(kSettingsCollectionViewId);
-
-  [ChromeEarlGreyUI openSettingsMenu];
-  [[[EarlGrey selectElementWithMatcher:settingToTap]
-         usingSearchAction:grey_scrollInDirection(kGREYDirectionDown,
-                                                  kScrollDisplacement)
-      onElementWithMatcher:settingsCollectionViewMatcher]
-      performAction:grey_tap()];
-}
-
 // Closes a sub-settings menu, and then the general Settings menu.
 - (void)closeSubSettingsMenu {
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(
                                    grey_accessibilityID(@"ic_arrow_back"),
                                    grey_accessibilityTrait(
                                        UIAccessibilityTraitButton),
                                    nil)] performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 }
 
 // Performs the steps to clear browsing data. Must be called on the
 // Clear Browsing Data settings screen, after having selected the data types
 // scheduled for removal.
 - (void)clearBrowsingData {
-  [[EarlGrey selectElementWithMatcher:ClearBrowsingDataButton()]
-      performAction:grey_tap()];
+  [ChromeEarlGreyUI tapButtonInClearBrowsingDataMenu:ClearBrowsingDataButton()];
   [[EarlGrey selectElementWithMatcher:ConfirmClearBrowsingDataButton()]
       performAction:grey_tap()];
+
+  // Before returning, make sure that the top of the Clear Browsing Data
+  // settings screen is visible to match the state at the start of the method.
+  id<GREYMatcher> clearBrowsingDataViewMatcher =

[Eugene But (OOO till 7-30), 2017/05/09 00:15:03]

nit: Do you want to create a function for this matcher?

[baxley, 2017/05/09 18:39:19]

Good idea. It's used in a few files so I put it in chrome_matchers and updated
other callsites

+      grey_accessibilityID(kClearBrowsingDataCollectionViewId);
+  [[EarlGrey selectElementWithMatcher:clearBrowsingDataViewMatcher]
+      performAction:grey_scrollToContentEdge(kGREYContentEdgeTop)];
 }
 
 // Exits Settings by clicking on the Done button.
 - (void)dismissSettings {
   // Dismiss the settings.
   [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 
   // Wait for UI components to finish loading.
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
 }
 
 // From the NTP, clears the cookies and site data via the UI.
 - (void)clearCookiesAndSiteData {
   [ChromeEarlGreyUI openSettingsMenu];
-  [[EarlGrey selectElementWithMatcher:PrivacyButton()]
-      performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:ClearBrowsingDataCell()]
-      performAction:grey_tap()];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:PrivacyButton()];
+  [ChromeEarlGreyUI tapButtonInPrivacyMenu:ClearBrowsingDataCell()];
 
   // "Browsing history", "Cookies, Site Data" and "Cached Images and Files"
   // are the default checked options when the prefs are registered. Uncheck
   // "Browsing history" and "Cached Images and Files".
   // Prefs are reset to default at the end of each test.
   [[EarlGrey selectElementWithMatcher:ClearBrowsingHistoryButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:ClearCacheButton()]
       performAction:grey_tap()];
 
   [self clearBrowsingData];
   [self dismissSettings];
 }
 
 // From the NTP, clears the saved passwords via the UI.
 - (void)clearPasswords {
   [ChromeEarlGreyUI openSettingsMenu];
-  [[EarlGrey selectElementWithMatcher:PrivacyButton()]
-      performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:ClearBrowsingDataCell()]
-      performAction:grey_tap()];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:PrivacyButton()];
+  [ChromeEarlGreyUI tapButtonInPrivacyMenu:ClearBrowsingDataCell()];
 
   // "Browsing history", "Cookies, Site Data" and "Cached Images and Files"
   // are the default checked options when the prefs are registered. Unckeck all
   // of them and check "Passwords".
   [[EarlGrey selectElementWithMatcher:ClearBrowsingHistoryButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:ClearCookiesButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:ClearCacheButton()]
       performAction:grey_tap()];
@@ skipping 54 matching lines @@
   preferences->SetBoolean(browsing_data::prefs::kDeleteCookies, true);
   preferences->SetBoolean(browsing_data::prefs::kDeletePasswords, false);
   preferences->SetBoolean(browsing_data::prefs::kDeleteFormData, false);
 }
 
 // Checks the presence (or absence) of saved passwords.
 // If |saved| is YES, it checks that there is a Saved Passwords section.
 // If |saved| is NO, it checks that there is no Saved Passwords section.
 - (void)checkIfPasswordsSaved:(BOOL)saved {
   [ChromeEarlGreyUI openSettingsMenu];
-  [[EarlGrey selectElementWithMatcher:PasswordsButton()]
-      performAction:grey_tap()];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:PasswordsButton()];
 
   id<GREYMatcher> visibilityMatcher =
       saved ? grey_sufficientlyVisible() : grey_notVisible();
   [[EarlGrey selectElementWithMatcher:
                  grey_text(l10n_util::GetNSString(
                      IDS_PASSWORD_MANAGER_SHOW_PASSWORDS_TAB_TITLE))]
       assertWithMatcher:visibilityMatcher];
 
   // Close the Settings.
   [self closeSubSettingsMenu];
@@ skipping 359 matching lines @@
 // Verifies the UI elements are accessible on the Settings page.
 - (void)testAccessibilityOnSettingsPage {
   [ChromeEarlGreyUI openSettingsMenu];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 }
 
 // Verifies the UI elements are accessible on the Content Settings page.
 - (void)testAccessibilityOnContentSettingsPage {
-  [self openSubSettingMenu:chrome_test_util::ButtonWithAccessibilityLabelId(
-                               IDS_IOS_CONTENT_SETTINGS_TITLE)];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:ContentSettingsButton()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Content Settings
 // Block Popups page.
 - (void)testAccessibilityOnContentSettingsBlockPopupsPage {
-  [self openSubSettingMenu:chrome_test_util::ButtonWithAccessibilityLabelId(
-                               IDS_IOS_CONTENT_SETTINGS_TITLE)];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:ContentSettingsButton()];
   [[EarlGrey selectElementWithMatcher:BlockPopupsButton()]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Content Translations Settings
 // page.
 - (void)testAccessibilityOnContentSettingsTranslatePage {
-  [self openSubSettingMenu:chrome_test_util::ButtonWithAccessibilityLabelId(
-                               IDS_IOS_CONTENT_SETTINGS_TITLE)];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:ContentSettingsButton()];
   [[EarlGrey selectElementWithMatcher:TranslateSettingsButton()]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Privacy Settings page.
 - (void)testAccessibilityOnPrivacySettingsPage {
-  [self openSubSettingMenu:chrome_test_util::ButtonWithAccessibilityLabelId(
-                               IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY)];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:PrivacyButton()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Privacy Handoff Settings
 // page.
 - (void)testAccessibilityOnPrivacyHandoffSettingsPage {
-  [self openSubSettingMenu:chrome_test_util::ButtonWithAccessibilityLabelId(
-                               IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY)];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:PrivacyButton()];
   [[EarlGrey selectElementWithMatcher:PrivacyHandoffButton()]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Privacy Clear Browsing Data
 // Settings page.
 - (void)testAccessibilityOnPrivacyClearBrowsingHistoryPage {
-  [self openSubSettingMenu:chrome_test_util::ButtonWithAccessibilityLabelId(
-                               IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY)];
-  [[EarlGrey selectElementWithMatcher:ClearBrowsingDataButton()]
-      performAction:grey_tap()];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:PrivacyButton()];
+  [ChromeEarlGreyUI tapButtonInPrivacyMenu:ClearBrowsingDataButton()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Bandwidth Management Settings
 // page.
 - (void)testAccessibilityOnBandwidthManagementSettingsPage {
-  [self openSubSettingMenu:chrome_test_util::ButtonWithAccessibilityLabelId(
-                               IDS_IOS_BANDWIDTH_MANAGEMENT_SETTINGS)];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:BandwidthSettingsButton()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Bandwidth Preload Webpages
 // Settings page.
 - (void)testAccessibilityOnBandwidthPreloadWebpagesSettingsPage {
-  [self openSubSettingMenu:chrome_test_util::ButtonWithAccessibilityLabelId(
-                               IDS_IOS_BANDWIDTH_MANAGEMENT_SETTINGS)];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:BandwidthSettingsButton()];
   [[EarlGrey selectElementWithMatcher:BandwidthPreloadWebpagesButton()]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Save Passwords page.
 - (void)testAccessibilityOnSavePasswords {
   [ChromeEarlGreyUI openSettingsMenu];
   [[EarlGrey selectElementWithMatcher:PasswordsButton()]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Search engine page.
 - (void)testAccessibilityOnSearchEngine {
   [ChromeEarlGreyUI openSettingsMenu];
   [[EarlGrey selectElementWithMatcher:SearchEngineButton()]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Autofill Forms page.
 - (void)testAccessibilityOnAutofillForms {
   [ChromeEarlGreyUI openSettingsMenu];
-  [[EarlGrey selectElementWithMatcher:AutofillButton()]
-      performAction:grey_tap()];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:AutofillButton()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Google Apps page.
 - (void)testAccessibilityOnGoogleApps {
   // TODO(crbug/711511): Remove when Native App Launcher is full deprecated.
   if (!experimental_flags::IsNativeAppLauncherEnabled())
     return;
-  [self openSubSettingMenu:GoogleAppsButton()];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:GoogleAppsButton()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the About Chrome page.
 - (void)testAccessibilityOnGoogleChrome {
-  [self openSubSettingMenu:GoogleChromeButton()];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:GoogleChromeButton()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Voice Search page.
 - (void)testAccessibilityOnVoiceSearch {
-  [self openSubSettingMenu:VoiceSearchButton()];
+  [ChromeEarlGreyUI openSettingsMenu];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:VoiceSearchButton()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 // Verifies the UI elements are accessible on the Passwords page.
 - (void)testAccessibilityOnPasswords {
   [self openPasswordSettings];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
@@ skipping 73 matching lines @@
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
 
   // Verify that the Settings register keyboard commands.
   GREYAssertNotNil(settings.keyCommands,
                    @"Settings should register key commands when presented.");
 }
 
 // Verifies the UI elements are accessible on the Send Usage Data page.
 - (void)testAccessibilityOnSendUsageData {
   [ChromeEarlGreyUI openSettingsMenu];
-  [[EarlGrey selectElementWithMatcher:PrivacyButton()]
-      performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:SendUsageDataButton()]
-      performAction:grey_tap()];
+  [ChromeEarlGreyUI tapButtonInSettingsMenu:PrivacyButton()];
+  [ChromeEarlGreyUI tapButtonInPrivacyMenu:SendUsageDataButton()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 @end