Make settings_egtest.mm work in landscape on small phones.

ios/chrome/test/earl_grey/chrome_earl_grey_ui.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 "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
 
+#import "ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller.h"
+#import "ios/chrome/browser/ui/settings/privacy_collection_view_controller.h"
+#import "ios/chrome/browser/ui/settings/settings_collection_view_controller.h"
 #import "ios/chrome/browser/ui/tools_menu/tools_menu_constants.h"
 #import "ios/chrome/browser/ui/tools_menu/tools_popup_controller.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #include "ios/chrome/test/app/navigation_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/testing/wait_util.h"
 #import "ios/web/public/test/earl_grey/js_test_util.h"
 #import "ios/web/public/test/earl_grey/web_view_matchers.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
+using chrome_test_util::ButtonWithAccessibilityLabel;
 using testing::WaitUntilConditionOrTimeout;
 using testing::kWaitForPageLoadTimeout;
 
+namespace {
+
+// Returns a GREYAction to scroll down (swipe up) for a reasonably small amount.
+id<GREYAction> ScrollDown() {
+  // 150 is a reasonable value to ensure all menu items are seen, without too
+  // much delay. With a larger value, some menu items could be skipped while
+  // searching. A smaller value increses the area that is searched, but slows
+  // down the scroll.
+  CGFloat const kMenuScrollDisplacement = 150;
+  return grey_scrollInDirection(kGREYDirectionDown, kMenuScrollDisplacement);
+}
+}  // namespace
+
 @implementation ChromeEarlGreyUI
 
 + (void)openToolsMenu {
   // TODO(crbug.com/685570): Fix the tap instead of adding a delay.
   GREYCondition* myCondition = [GREYCondition
       conditionWithName:@"Delay to ensure the toolbar menu can be opened"
                   block:^BOOL {
                     return NO;
                   }];
   [myCondition waitWithTimeout:0.5];
 
   // TODO(crbug.com/639524): Add logic to ensure the app is in the correct
   // state, for example DCHECK if no tabs are displayed.
   [[[EarlGrey
       selectElementWithMatcher:grey_allOf(chrome_test_util::ToolsMenuButton(),
                                           grey_sufficientlyVisible(), nil)]
          usingSearchAction:grey_swipeSlowInDirection(kGREYDirectionDown)
       onElementWithMatcher:web::WebViewScrollView(
                                chrome_test_util::GetCurrentWebState())]
       performAction:grey_tap()];
   // TODO(crbug.com/639517): Add webViewScrollView matcher so we don't have
   // to always find it.
 }
 
 + (void)openSettingsMenu {
   [ChromeEarlGreyUI openToolsMenu];
-  id<GREYMatcher> toolsMenuTableViewMatcher =
-      grey_accessibilityID(kToolsMenuTableViewId);
-  [[[EarlGrey
-      selectElementWithMatcher:grey_accessibilityID(kToolsMenuSettingsId)]
-         usingSearchAction:grey_scrollToContentEdge(kGREYContentEdgeBottom)
-      onElementWithMatcher:toolsMenuTableViewMatcher] performAction:grey_tap()];
+  id<GREYMatcher> interactableSettingsButton = grey_allOf(

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

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

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

I created a function for SettingsButton, but not the interactable one. When
doing a search action the matcher must check for interactable, while other uses
don't care.

+      grey_accessibilityID(kToolsMenuSettingsId), grey_interactable(), nil);
+  [[[EarlGrey selectElementWithMatcher:interactableSettingsButton]
+         usingSearchAction:ScrollDown()
+      onElementWithMatcher:grey_accessibilityID(kToolsMenuTableViewId)]
+      performAction:grey_tap()];
+}
+
++ (void)tapButtonInSettingsMenu:(id<GREYMatcher>)buttonMatcher {
+  id<GREYMatcher> interactableButtonMatcher =
+      grey_allOf(buttonMatcher, grey_interactable(), nil);
+  [[[EarlGrey selectElementWithMatcher:interactableButtonMatcher]
+         usingSearchAction:ScrollDown()
+      onElementWithMatcher:grey_accessibilityID(kSettingsCollectionViewId)]
+      performAction:grey_tap()];
+}
+
++ (void)tapButtonInClearBrowsingDataMenu:(id<GREYMatcher>)buttonMatcher {
+  id<GREYMatcher> clearBrowsingDataViewMatcher =

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

ditto

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

Done.

+      grey_accessibilityID(kClearBrowsingDataCollectionViewId);
+  id<GREYMatcher> interactableButtonMatcher =
+      grey_allOf(buttonMatcher, grey_interactable(), nil);
+  [[[EarlGrey selectElementWithMatcher:interactableButtonMatcher]
+         usingSearchAction:ScrollDown()
+      onElementWithMatcher:clearBrowsingDataViewMatcher]
+      performAction:grey_tap()];
+}
+
++ (void)tapButtonInPrivacyMenu:(id<GREYMatcher>)buttonMatcher {
+  id<GREYMatcher> interactableButtonMatcher =
+      grey_allOf(buttonMatcher, grey_interactable(), nil);
+  [[[EarlGrey selectElementWithMatcher:interactableButtonMatcher]
+         usingSearchAction:ScrollDown()
+      onElementWithMatcher:grey_accessibilityID(kPrivacyCollectionViewId)]
+      performAction:grey_tap()];
 }
 
 + (void)openNewTab {
   [ChromeEarlGreyUI openToolsMenu];
   id<GREYMatcher> newTabButtonMatcher =
       grey_accessibilityID(kToolsMenuNewTabId);
   [[EarlGrey selectElementWithMatcher:newTabButtonMatcher]
       performAction:grey_tap()];
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
 }
@@ skipping 35 matching lines @@
     return error == nil;
   };
   NSString* errorMessage =
       isVisible ? @"Toolbar was not visible" : @"Toolbar was visible";
   GREYAssert(testing::WaitUntilConditionOrTimeout(
                  kWaitForToolbarAnimationTimeout, condition),
              errorMessage);
 }
 
 @end