Make settings_egtest.mm work in landscape on small phones.

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

 // Copyright 2017 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.
 
 #include "base/callback.h"
 #include "base/mac/foundation_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/autofill/core/common/password_form.h"
@@ skipping 28 matching lines @@
 // integration tests and features which are not currently unittestable should
 // go here, the rest into the unittest.
 // This test only uses the new UI which allows viewing passwords.
 // TODO(crbug.com/159166): Remove the above sentence once the new UI is the
 // default one.
 
 using autofill::PasswordForm;
 using chrome_test_util::ButtonWithAccessibilityLabel;
 using chrome_test_util::ButtonWithAccessibilityLabelId;
 using chrome_test_util::NavigationBarDoneButton;
+using chrome_test_util::SettingsMenuButton;
 
 namespace {
 
 // How many points to scroll at a time when searching for an element. Setting it
 // too low means searching takes too long and the test might time out. Setting
 // it too high could result in scrolling way past the searched element.
 constexpr int kScrollAmount = 150;
 
-// Matcher for the Settings button in the tools menu.
-id<GREYMatcher> SettingsButton() {
-  return grey_accessibilityID(kToolsMenuSettingsId);
-}
-
 // Matcher for the Save Passwords cell on the main Settings screen.
 id<GREYMatcher> PasswordsButton() {
   return ButtonWithAccessibilityLabelId(IDS_IOS_SAVE_PASSWORDS);
 }
 
 // Matcher for a password entry for |username|.
 id<GREYMatcher> Entry(NSString* username) {
   return ButtonWithAccessibilityLabel(username);
 }
 
@@ skipping 208 matching lines @@
   [self passwordStore]->RemoveLoginsCreatedBetween(base::Time(), base::Time(),
                                                    base::Closure());
   // Allow the PasswordStore to process this on the DB thread.
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
 }
 
 // Opens the passwords page from the NTP. It requires no menus to be open.
 - (void)openPasswordSettings {
   // Open settings and verify data in the view controller.
   [ChromeEarlGreyUI openToolsMenu];
-  [[EarlGrey selectElementWithMatcher:SettingsButton()]
+  [[EarlGrey selectElementWithMatcher:SettingsMenuButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:PasswordsButton()]
       performAction:grey_tap()];
 
   // Wait for UI components to finish loading.
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
 }
 
 // Tap back arrow, to get one level higher in settings.
 - (void)tapBackArrow {
@@ skipping 184 matching lines @@
   // Wait until the fade-out animation completes.
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
 
   [self tapBackArrow];
   [self tapBackArrow];
   [self tapDone];
   [self clearPasswordStore];
 }
 
 @end