Make EarlGrey matchers compliant with Chromium style.

ios/chrome/browser/ui/bookmarks/bookmarks_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.
 
 #include <vector>
 
 #import <EarlGrey/EarlGrey.h>
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
@@ skipping 24 matching lines @@
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/public/provider/chrome/browser/signin/fake_chrome_identity.h"
 #import "ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.h"
 #import "ios/testing/wait_util.h"
 #import "ios/web/public/test/http_server.h"
 #include "ios/web/public/test/http_server_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/tree_node_iterator.h"
 #include "url/gurl.h"
 
-using chrome_test_util::buttonWithAccessibilityLabel;
-using chrome_test_util::buttonWithAccessibilityLabelId;
+using chrome_test_util::ButtonWithAccessibilityLabel;
+using chrome_test_util::ButtonWithAccessibilityLabelId;
 
 namespace {
 // TODO(crbug.com/616929): Move common matchers that are useful across tests
 // into a shared location.
 
 // Matcher for bookmarks tool tip star.
-id<GREYMatcher> starButton() {
-  return buttonWithAccessibilityLabelId(IDS_TOOLTIP_STAR);
+id<GREYMatcher> StarButton() {
+  return ButtonWithAccessibilityLabelId(IDS_TOOLTIP_STAR);
 }
 
 // Matcher for the button to add bookmark.
-id<GREYMatcher> addBookmarkButton() {
-  return buttonWithAccessibilityLabelId(IDS_BOOKMARK_ADD_EDITOR_TITLE);
+id<GREYMatcher> AddBookmarkButton() {
+  return ButtonWithAccessibilityLabelId(IDS_BOOKMARK_ADD_EDITOR_TITLE);
 }
 
 // Matcher for the lit star buttom on iPhone that will open the edit button
 // screen.
-id<GREYMatcher> litStarButtoniPhone() {
-  return buttonWithAccessibilityLabelId(IDS_IOS_TOOLS_MENU_EDIT_BOOKMARK);
+id<GREYMatcher> LitStarButtoniPhone() {
+  return ButtonWithAccessibilityLabelId(IDS_IOS_TOOLS_MENU_EDIT_BOOKMARK);
 }
 
 // Matcher for the button to edit bookmark.
-id<GREYMatcher> editBookmarkButton() {
-  return buttonWithAccessibilityLabelId(IDS_IOS_BOOKMARK_ACTION_EDIT);
+id<GREYMatcher> EditBookmarkButton() {
+  return ButtonWithAccessibilityLabelId(IDS_IOS_BOOKMARK_ACTION_EDIT);
 }
 
 // Matcher for the button to close the tools menu.
-id<GREYMatcher> closeToolsMenuButton() {
+id<GREYMatcher> CloseToolsMenuButton() {
   NSString* closeMenuButtonText =
       l10n_util::GetNSString(IDS_IOS_TOOLBAR_CLOSE_MENU);
   return grey_allOf(grey_accessibilityID(kToolbarToolsMenuButtonIdentifier),
                     grey_accessibilityLabel(closeMenuButtonText), nil);
 }
 
 // Matcher for the Done button on the bookmarks UI.
-id<GREYMatcher> bookmarksDoneButton() {
+id<GREYMatcher> BookmarksDoneButton() {
   return grey_allOf(
-      buttonWithAccessibilityLabelId(IDS_IOS_BOOKMARK_DONE_BUTTON),
+      ButtonWithAccessibilityLabelId(IDS_IOS_BOOKMARK_DONE_BUTTON),
       grey_not(grey_accessibilityTrait(UIAccessibilityTraitKeyboardKey)), nil);
 }
 
 // Matcher for the More Menu.
-id<GREYMatcher> moreMenuButton() {
-  return buttonWithAccessibilityLabelId(
+id<GREYMatcher> MoreMenuButton() {
+  return ButtonWithAccessibilityLabelId(
       IDS_IOS_BOOKMARK_NEW_MORE_BUTTON_ACCESSIBILITY_LABEL);
 }
 
 // Types of actions possible in the contextual action sheet.
 typedef NS_ENUM(NSUInteger, Action) {
   ActionSelect,
   ActionEdit,
   ActionMove,
   ActionDelete,
 };
 
 // Matcher for the action sheet's buttons.
-id<GREYMatcher> actionSheet(Action action) {
+id<GREYMatcher> ActionSheet(Action action) {
   int accessibilityLabelMessageID;
   switch (action) {
     case ActionSelect:
       accessibilityLabelMessageID = IDS_IOS_BOOKMARK_ACTION_SELECT;
       break;
     case ActionEdit:
       accessibilityLabelMessageID = IDS_IOS_BOOKMARK_ACTION_EDIT;
       break;
     case ActionMove:
       accessibilityLabelMessageID = IDS_IOS_BOOKMARK_ACTION_MOVE;
@@ skipping 41 matching lines @@
 
 // Verifies that adding a bookmark and removing a bookmark via the UI properly
 // updates the BookmarkModel.
 - (void)testAddRemoveBookmark {
   const GURL bookmarkedURL = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/pony.html");
   std::string expectedURLContent = bookmarkedURL.GetContent();
   NSString* bookmarkTitle = @"my bookmark";
 
   [ChromeEarlGrey loadURL:bookmarkedURL];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                           expectedURLContent)]
       assertWithMatcher:grey_notNil()];
 
   // Add the bookmark from the UI.
   [[self class] bookmarkCurrentTabWithTitle:bookmarkTitle];
 
   // Verify the bookmark is set.
   [[self class] assertBookmarksWithTitle:bookmarkTitle expectedCount:1];
 
   NSString* const kStarLitLabel =
       !IsCompact() ? l10n_util::GetNSString(IDS_TOOLTIP_STAR)
                    : l10n_util::GetNSString(IDS_IOS_BOOKMARK_EDIT_SCREEN_TITLE);
   // Verify the star is lit.
   if (IsCompact()) {
     [ChromeEarlGreyUI openToolsMenu];
   }
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(kStarLitLabel)]
       assertWithMatcher:grey_notNil()];
 
   // Clear the bookmark via the UI.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(kStarLitLabel)]
       performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionDelete)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionDelete)]
       performAction:grey_tap()];
 
   // Verify the bookmark is not in the BookmarkModel.
   [[self class] assertBookmarksWithTitle:bookmarkTitle expectedCount:0];
 
   NSString* const kStarUnlitLabel =
       !IsCompact() ? l10n_util::GetNSString(IDS_TOOLTIP_STAR)
                    : l10n_util::GetNSString(IDS_BOOKMARK_ADD_EDITOR_TITLE);
 
   // Verify the star is not lit.
   if (IsCompact()) {
     [ChromeEarlGreyUI openToolsMenu];
   }
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(kStarUnlitLabel)]
       assertWithMatcher:grey_notNil()];
 
   // TODO(crbug.com/617652): This code should be removed when a common helper
   // is added to close any menus, which should be run as test setup.
   if (IsCompact()) {
-    [[EarlGrey selectElementWithMatcher:closeToolsMenuButton()]
+    [[EarlGrey selectElementWithMatcher:CloseToolsMenuButton()]
         performAction:grey_tap()];
   }
 
   // Close the opened tab.
   base::scoped_nsobject<GenericChromeCommand> command(
       [[GenericChromeCommand alloc] initWithTag:IDC_CLOSE_TAB]);
   chrome_test_util::RunCommandWithActiveViewController(command);
 }
 
 // Tests that tapping a bookmark on the NTP navigates to the proper URL.
 - (void)testTapBookmark {
   const GURL bookmarkURL = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/destination.html");
   NSString* bookmarkTitle = @"smokeTapBookmark";
 
   // Load a bookmark into the bookmark model.
   [[self class] addBookmark:bookmarkURL withTitle:bookmarkTitle];
 
   // Open the UI for Bookmarks.
   [[self class] openMobileBookmarks];
 
   // Verify bookmark is visible.
   [[EarlGrey
-      selectElementWithMatcher:buttonWithAccessibilityLabel(bookmarkTitle)]
+      selectElementWithMatcher:ButtonWithAccessibilityLabel(bookmarkTitle)]
       assertWithMatcher:grey_sufficientlyVisible()
                   error:nil];
 
   // Tap on the bookmark and verify the URL that appears in the omnibox.
   [[EarlGrey
-      selectElementWithMatcher:buttonWithAccessibilityLabel(bookmarkTitle)]
+      selectElementWithMatcher:ButtonWithAccessibilityLabel(bookmarkTitle)]
       performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                           bookmarkURL.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Test to set bookmarks in multiple tabs.
 - (void)testBookmarkMultipleTabs {
   const GURL firstURL = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/pony.html");
   const GURL secondURL = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/destination.html");
@@ skipping 13 matching lines @@
   // Tap on one of the standard bookmark. Verify that it loads.
   [[EarlGrey selectElementWithMatcher:grey_text(@"Second URL")]
       performAction:grey_tap()];
 
   // Wait for the page to load.
   [ChromeEarlGrey waitForPageToFinishLoading];
 
   // Check the URL is correct.
   const GURL secondURL = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/destination.html");
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::omnibox()]
-      assertWithMatcher:chrome_test_util::omniboxText(secondURL.GetContent())];
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      assertWithMatcher:chrome_test_util::OmniboxText(secondURL.GetContent())];
 }
 
 // Try deleting a bookmark, then undoing that delete.
 - (void)testUndoDeleteBookmark {
   [[self class] setupStandardBookmarks];
   [[self class] openMobileBookmarks];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Second URL Info")]
       performAction:grey_tap()];
 
   // Delete it.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionDelete)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionDelete)]
       performAction:grey_tap()];
 
   // Wait until it's gone.
   [[self class] waitForDeletionOfBookmarkWithTitle:@"Second URL"];
 
   // Press undo
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Undo")]
       performAction:grey_tap()];
 
   // Verify it's back.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Second URL")]
       assertWithMatcher:grey_notNil()];
 }
 
 // Try deleting a bookmark from the edit screen, then undoing that delete.
 - (void)testUndoDeleteBookmarkFromEditScreen {
   [[self class] setupStandardBookmarks];
   [[self class] openMobileBookmarks];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Second URL Info")]
       performAction:grey_tap()];
 
   // Tap the edit action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionEdit)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionEdit)]
       performAction:grey_tap()];
 
   // Delete it.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionDelete)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionDelete)]
       performAction:grey_tap()];
 
   // Wait until it's gone.
   ConditionBlock condition = ^{
     NSError* error = nil;
     [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Second URL")]
         assertWithMatcher:grey_notVisible()
                     error:&error];
     return error == nil;
   };
@@ skipping 15 matching lines @@
   [[self class] openMobileBookmarks];
 
   // Verify that folder 2 only has 1 child.
   [[self class] assertChildCount:1 ofFolderWithName:@"Folder 2"];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Second URL Info")]
       performAction:grey_tap()];
 
   // Select a first bookmark.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionSelect)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionSelect)]
       performAction:grey_tap()];
 
   // Select a second bookmark.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"First URL")]
       performAction:grey_tap()];
 
   // Choose the move action.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Move")]
       performAction:grey_tap()];
 
@@ skipping 28 matching lines @@
 
 - (void)testLabelUpdatedUponMove {
   [[self class] setupStandardBookmarks];
   [[self class] openMobileBookmarks];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"First URL Info")]
       performAction:grey_tap()];
 
   // Tap on the Edit action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionEdit)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionEdit)]
       performAction:grey_tap()];
 
   // Tap the Folder button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Change Folder")]
       performAction:grey_tap()];
 
   // Create a new folder with default name.
   [[self class] addFolderWithName:nil];
 
   // Verify that the editor is present.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Single Bookmark Editor")]
       assertWithMatcher:grey_notNil()];
 
   // Check the new folder label.
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(
                                    grey_accessibilityID(@"Change Folder"),
                                    grey_accessibilityLabel(@"New Folder"), nil)]
       assertWithMatcher:grey_notNil()];
 }
 
 // Test the creation of a bookmark and new folder.
 - (void)testAddBookmarkInNewFolder {
   const GURL bookmarkedURL = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/pony.html");
   std::string expectedURLContent = bookmarkedURL.GetContent();
 
   [ChromeEarlGrey loadURL:bookmarkedURL];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                           expectedURLContent)]
       assertWithMatcher:grey_notNil()];
 
   [[self class] starCurrentTab];
 
   // Verify the snackbar title.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(@"Bookmarked")]
       assertWithMatcher:grey_notNil()];
 
   // Tap on the snackbar.
@@ skipping 35 matching lines @@
   NSString* newFolderTitle = @"New Folder Title";
 
   [[self class] setupStandardBookmarks];
   [[self class] openMobileBookmarks];
   [[self class] openEditBookmarkFolderWithFolderTitle:existingFolderTitle];
   [[self class] renameBookmarkFolderWithFolderTitle:newFolderTitle];
   [[self class] closeEditBookmarkFolder];
 
   if (IsCompact()) {
     // Exit from bookmarks modal. IPad shows bookmarks in tab.
-    [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+    [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
   }
 
   // Verify that the change has been made.
   [[self class] openMobileBookmarks];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(existingFolderTitle)]
       assertWithMatcher:grey_nil()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(newFolderTitle)]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that the default folder bookmarks are saved in is updated to the last
 // used folder.
 - (void)testStickyDefaultFolder {
   [[self class] setupStandardBookmarks];
   [[self class] openMobileBookmarks];
 
   // Tap on the top-right button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"First URL Info")]
       performAction:grey_tap()];
 
   // Tap the edit action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionEdit)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionEdit)]
       performAction:grey_tap()];
 
   // Tap the Folder button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Change Folder")]
       performAction:grey_tap()];
 
   // Create a new folder.
   [[self class] addFolderWithName:@"Sticky Folder"];
 
   // Verify that the editor is present.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Single Bookmark Editor")]
       assertWithMatcher:grey_sufficientlyVisible()];
 
   // Tap the Done button.
-  [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+  [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
       performAction:grey_tap()];
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Single Bookmark Editor")]
       assertWithMatcher:grey_notVisible()];
 
   if (IsCompact()) {
     // Dismiss the bookmarks screen.
     [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Exit")]
         performAction:grey_tap()];
   }
 
   // Second, bookmark a page.
 
   // Verify that the bookmark that is going to be added is not in the
   // BookmarkModel.
   const GURL bookmarkedURL = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/fullscreen.html");
   NSString* const bookmarkedURLString =
       base::SysUTF8ToNSString(bookmarkedURL.spec());
   [[self class] assertBookmarksWithTitle:bookmarkedURLString expectedCount:0];
   // Open the page.
   std::string expectedURLContent = bookmarkedURL.GetContent();
   [ChromeEarlGrey loadURL:bookmarkedURL];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                           expectedURLContent)]
       assertWithMatcher:grey_notNil()];
 
   // Verify that the folder has only one element.
   [[self class] assertChildCount:1 ofFolderWithName:@"Sticky Folder"];
 
   // Bookmark the page.
   [[self class] starCurrentTab];
 
   // Verify the snackbar title.
@@ skipping 12 matching lines @@
 // are saved to the bookmark only when saving the results.
 - (void)testMoveDoesSaveOnSave {
   [[self class] setupStandardBookmarks];
   [[self class] openTopLevelBookmarksFolder];
 
   // Tap on the top-right button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"First URL Info")]
       performAction:grey_tap()];
 
   // Tap the edit action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionEdit)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionEdit)]
       performAction:grey_tap()];
 
   // Tap the Folder button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Change Folder")]
       performAction:grey_tap()];
 
   // Create a new folder.
   [[self class] addFolderWithName:nil];
 
   // Verify that the editor is present.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Single Bookmark Editor")]
       assertWithMatcher:grey_sufficientlyVisible()];
 
   // Check that the new folder doesn't contain the bookmark.
   [[self class] assertChildCount:0 ofFolderWithName:@"New Folder"];
 
   // Tap the Done button.
-  [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+  [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
       performAction:grey_tap()];
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Single Bookmark Editor")]
       assertWithMatcher:grey_notVisible()];
 
   // Check that the new folder contains the bookmark.
   [[self class] assertChildCount:1 ofFolderWithName:@"New Folder"];
 
   // Dismiss the bookmarks screen.
   if (IsCompact()) {
     // Dismiss the bookmarks screen.
     [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Exit")]
         performAction:grey_tap()];
   }
 
   // Check that the new folder still contains the bookmark.
   [[self class] assertChildCount:1 ofFolderWithName:@"New Folder"];
 }
 
 // Test thats editing a single bookmark correctly persists data.
 - (void)testSingleBookmarkEdit {
   [[self class] setupStandardBookmarks];
   [[self class] openTopLevelBookmarksFolder];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"First URL Info")]
       performAction:grey_tap()];
 
   // Tap the edit action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionEdit)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionEdit)]
       performAction:grey_tap()];
 
   // Replace the title field with new text.
   // TODO(crbug.com/644730): Use grey_replaceText instead of
   // grey_clearText/grey_typeText when EarlGrey's issue is fixed:
   // https://github.com/google/EarlGrey/issues/253
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Title Field_textField")]
       performAction:grey_clearText()];
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Title Field_textField")]
       performAction:grey_typeText(@"n5")];
 
   // Replace the url field with new text.
   // TODO(crbug.com/644730): Use grey_replaceText instead of
   // grey_clearText/grey_typeText when EarlGrey's issue is fixed:
   // https://github.com/google/EarlGrey/issues/253
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"URL Field_textField")]
       performAction:grey_clearText()];
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"URL Field_textField")]
       performAction:grey_typeText(@"www.a.fr")];
 
   // Dismiss editor.
-  [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+  [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
       performAction:grey_tap()];
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Single Bookmark Editor")]
       assertWithMatcher:grey_notVisible()];
 
   // Verify that the bookmark was updated.
-  [[EarlGrey selectElementWithMatcher:buttonWithAccessibilityLabel(@"n5")]
+  [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabel(@"n5")]
       assertWithMatcher:grey_sufficientlyVisible()];
   [[self class] assertExistenceOfBookmarkWithURL:@"http://www.a.fr" name:@"n5"];
 }
 
 // Tests that cancelling editing a single bookmark correctly doesn't persist
 // data.
 - (void)testSingleBookmarkCancelEdit {
   [[self class] setupStandardBookmarks];
   [[self class] openTopLevelBookmarksFolder];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"First URL Info")]
       performAction:grey_tap()];
 
   // Tap the edit action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionEdit)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionEdit)]
       performAction:grey_tap()];
 
   // Replace the title field with new text.
   // TODO(crbug.com/644730): Use grey_replaceText instead of
   // grey_clearText/grey_typeText when EarlGrey's issue is fixed:
   // https://github.com/google/EarlGrey/issues/253
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Title Field_textField")]
       performAction:grey_clearText()];
   [[EarlGrey
@@ skipping 12 matching lines @@
       performAction:grey_typeText(@"www.a.fr")];
 
   // Dismiss editor with Cancel button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Cancel")]
       performAction:grey_tap()];
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Single Bookmark Editor")]
       assertWithMatcher:grey_notVisible()];
 
   // Verify that the bookmark was not updated.
-  [[EarlGrey selectElementWithMatcher:buttonWithAccessibilityLabel(@"n5")]
+  [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabel(@"n5")]
       assertWithMatcher:grey_notVisible()];
   [[self class] assertAbsenceOfBookmarkWithURL:@"http://www.a.fr"];
 }
 
 // Tests that long pressing a bookmark selects it and gives access to editing,
 // as does the Info menu.
 - (void)testLongPressBookmark {
   [[self class] setupStandardBookmarks];
   [[self class] openTopLevelBookmarksFolder];
 
   // Long press the top-right button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"First URL Info")]
       performAction:grey_longPress()];
 
   // Tap the edit button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Edit_editing_bar")]
       performAction:grey_tap()];
 
   // Dismiss the editor screen.
-  [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+  [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
       performAction:grey_tap()];
 
   // Tap on the top-right button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"First URL Info")]
       performAction:grey_tap()];
 
   // Tap the edit action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionEdit)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionEdit)]
       performAction:grey_tap()];
 
   // Dismiss the editor screen.
-  [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+  [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
       performAction:grey_tap()];
 }
 
 // Tests the editing of a folder.
 - (void)testEditFolder {
   [[self class] setupStandardBookmarks];
   [[self class] openBookmarkFolder:@"Folder 1"];
 
   // Tap the Edit button in the navigation bar.
   [[EarlGrey
@@ skipping 50 matching lines @@
 
   // Check that the folder doesn't exist anymore.
   [[self class] assertFolderDoesntExistWithTitle:@"Folder 1"];
 }
 
 // Navigates to a deeply nested folder, deletes it and makes sure the UI is
 // consistent.
 - (void)testDeleteCurrentSubfolder {
   [[self class] setupStandardBookmarks];
   [[self class] openBookmarkFolder:@"Folder 1"];
-  [[EarlGrey selectElementWithMatcher:buttonWithAccessibilityLabel(@"Folder 2")]
+  [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabel(@"Folder 2")]
       performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:buttonWithAccessibilityLabel(@"Folder 3")]
+  [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabel(@"Folder 3")]
       performAction:grey_tap()];
 
   // Delete the folder.
   [[self class] deleteSelectedFolder];
 
   // Folder 3 is now deleted, UI should have moved to Folder 2, and Folder 2
   // should be empty.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(@"Folder 2")]
       assertWithMatcher:grey_sufficientlyVisible()];
   [[self class] assertChildCount:0 ofFolderWithName:@"Folder 2"];
   [[self class] assertFolderDoesntExistWithTitle:@"Folder 3"];
   [[self class] waitForDeletionOfBookmarkWithTitle:@"Folder 3"];
 }
 
 // Navigates to a deeply nested folder, delete its parent programatically.
 // Verifies that the UI is as expected.
 - (void)testDeleteParentFolder {
   [[self class] setupStandardBookmarks];
   [[self class] openBookmarkFolder:@"Folder 1"];
-  [[EarlGrey selectElementWithMatcher:buttonWithAccessibilityLabel(@"Folder 2")]
+  [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabel(@"Folder 2")]
       performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:buttonWithAccessibilityLabel(@"Folder 3")]
+  [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabel(@"Folder 3")]
       performAction:grey_tap()];
 
   // Remove the parent programmatically.
   [[self class] removeBookmarkWithTitle:@"Folder 2"];
 
   // Folder 2 and 3 are now deleted, UI should have moved to Folder1, and
   // Folder 1 should be empty.
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(
                                    grey_kindOfClass(NSClassFromString(
@@ skipping 66 matching lines @@
 // Tests moving a bookmark into a new folder created in the moving process.
 - (void)testCreateNewFolderWhileMovingBookmark {
   [[self class] setupStandardBookmarks];
   [[self class] openMobileBookmarks];
 
   // Tap the info disclosure indicator for the bookmark we want to move.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"First URL Info")]
       performAction:grey_tap()];
 
   // Choose to move the bookmark in the context menu.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionMove)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionMove)]
       performAction:grey_tap()];
 
   // Choose to move the bookmark into a new folder.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Create New Folder")]
       performAction:grey_tap()];
 
   // Enter custom new folder name.
   [[self class] renameBookmarkFolderWithFolderTitle:@"Title For New Folder"];
 
@@ skipping 127 matching lines @@
 - (void)testKeyboardCommandsNotRegistered_EditBookmark {
   [[self class] setupStandardBookmarks];
   [[self class] openMobileBookmarks];
 
   // Go to a bookmarked page. Tap on one of the standard bookmark.
   [[EarlGrey selectElementWithMatcher:grey_text(@"Second URL")]
       performAction:grey_tap()];
 
   // Edit the bookmark.
   if (!IsCompact()) {
-    [[EarlGrey selectElementWithMatcher:starButton()] performAction:grey_tap()];
+    [[EarlGrey selectElementWithMatcher:StarButton()] performAction:grey_tap()];
   } else {
     [ChromeEarlGreyUI openToolsMenu];
-    [[EarlGrey selectElementWithMatcher:litStarButtoniPhone()]
+    [[EarlGrey selectElementWithMatcher:LitStarButtoniPhone()]
         performAction:grey_tap()];
   }
   GREYAssertTrue(chrome_test_util::GetRegisteredKeyCommandsCount() == 0,
                  @"No keyboard commands are registered.");
 }
 
 // Tests that tapping No thanks on the promo make it disappear.
 - (void)testPromoNoThanksMakeItDisappear {
   [[self class] setupStandardBookmarks];
   [[self class] openTopLevelBookmarksFolder];
@@ skipping 57 matching lines @@
   [[self class] verifyPromoAlreadySeen:NO];
 }
 
 // Tests that all elements on the bookmarks landing page are accessible.
 - (void)testAccessibilityOnBookmarksLandingPage {
   [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
 
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   if (IsCompact()) {
     // Exit from bookmarks modal. IPad shows bookmarks in tab.
-    [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+    [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
   }
 }
 
 // Tests that all elements on the bookmarks Edit page are accessible.
 - (void)testAccessibilityOnBookmarksEditPage {
   [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
 
   // Load the menu for a bookmark.
-  [[EarlGrey selectElementWithMatcher:moreMenuButton()]
+  [[EarlGrey selectElementWithMatcher:MoreMenuButton()]
       performAction:grey_tap()];
 
   // Tap the edit action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionEdit)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionEdit)]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   if (IsCompact()) {
     // Exit from bookmarks modal. IPad shows bookmarks in tab.
-    [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+    [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
-    [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+    [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
   }
 }
 
 // Tests that all elements on the bookmarks Move page are accessible.
 - (void)testAccessibilityOnBookmarksMovePage {
   [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
 
   // Load the menu for a bookmark.
-  [[EarlGrey selectElementWithMatcher:moreMenuButton()]
+  [[EarlGrey selectElementWithMatcher:MoreMenuButton()]
       performAction:grey_tap()];
 
   // Tap the Move action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionMove)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionMove)]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   if (IsCompact()) {
     // Exit from bookmarks modal. IPad shows bookmarks in tab.
-    [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+    [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
-    [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+    [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
   }
 }
 
 // Tests that all elements on the bookmarks Move to New Folder page are
 // accessible.
 - (void)testAccessibilityOnBookmarksMoveToNewFolderPage {
   [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
 
   // Load the menu for a bookmark.
-  [[EarlGrey selectElementWithMatcher:moreMenuButton()]
+  [[EarlGrey selectElementWithMatcher:MoreMenuButton()]
       performAction:grey_tap()];
 
   // Tap the Move action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionMove)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionMove)]
       performAction:grey_tap()];
   // Tap on "Create New Folder."
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Create New Folder")]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   if (IsCompact()) {
     // Exit from bookmarks modal. IPad shows bookmarks in tab.
-    [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+    [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
-    [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+    [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
   }
 }
 
 // Tests that all elements on bookmarks Delete and Undo are accessible.
 - (void)testAccessibilityOnBookmarksDeleteUndo {
   [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
 
   // Load the menu for a bookmark.
-  [[EarlGrey selectElementWithMatcher:moreMenuButton()]
+  [[EarlGrey selectElementWithMatcher:MoreMenuButton()]
       performAction:grey_tap()];
 
   // Tap the Delete action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionDelete)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionDelete)]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   if (IsCompact()) {
     // Exit from bookmarks modal. IPad shows bookmarks in tab.
-    [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+    [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
   }
 }
 
 // Tests that all elements on the bookmarks Select page are accessible.
 - (void)testAccessibilityOnBookmarksSelect {
   [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
 
   // Load the menu for a bookmark.
-  [[EarlGrey selectElementWithMatcher:moreMenuButton()]
+  [[EarlGrey selectElementWithMatcher:MoreMenuButton()]
       performAction:grey_tap()];
 
   // Tap the Select action.
-  [[EarlGrey selectElementWithMatcher:actionSheet(ActionSelect)]
+  [[EarlGrey selectElementWithMatcher:ActionSheet(ActionSelect)]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   // Dismiss selector with Cancel button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Exit Edit Mode")]
       performAction:grey_tap()];
 }
 
 #pragma mark Helper Methods
 
 // Navigates to the bookmark manager UI.
@@ skipping 50 matching lines @@
       "http://ios/testing/data/http_server_files/destination.html");
   NSString* bookmarkTitle = @"smokeTapBookmark";
   // Load a bookmark into the bookmark model.
   [[self class] addBookmark:bookmarkURL withTitle:bookmarkTitle];
 
   // Open the UI for Bookmarks.
   [[self class] openMobileBookmarks];
 
   // Verify bookmark is visible.
   [[EarlGrey
-      selectElementWithMatcher:buttonWithAccessibilityLabel(bookmarkTitle)]
+      selectElementWithMatcher:ButtonWithAccessibilityLabel(bookmarkTitle)]
       assertWithMatcher:grey_sufficientlyVisible()
                   error:nil];
 }
 
 // Navigates to the edit folder UI for |folderTitle|.
 + (void)openEditBookmarkFolderWithFolderTitle:(NSString*)folderTitle {
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(folderTitle)]
       performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:editBookmarkButton()]
+  [[EarlGrey selectElementWithMatcher:EditBookmarkButton()]
       performAction:grey_tap()];
 }
 
 // Dismisses the edit folder UI.
 + (void)closeEditBookmarkFolder {
-  [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+  [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
       performAction:grey_tap()];
 }
 
 // Rename folder title to |folderTitle|. Must be in edit folder UI.
 + (void)renameBookmarkFolderWithFolderTitle:(NSString*)folderTitle {
   NSString* titleIdentifier = @"Title_textField";
   NSString* clearTextFieldIdentifier = @"Clear text";
 
   // Edit the title field.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(titleIdentifier)]
@@ skipping 10 matching lines @@
 }
 
 // Tap on the star to bookmark a page, then edit the bookmark to change the
 // title to |title|.
 + (void)bookmarkCurrentTabWithTitle:(NSString*)title {
   [[self class] waitForBookmarkModelLoaded:YES];
   // Add the bookmark from the UI.
   [[self class] starCurrentTab];
 
   // Set the bookmark name.
-  [[EarlGrey selectElementWithMatcher:editBookmarkButton()]
+  [[EarlGrey selectElementWithMatcher:EditBookmarkButton()]
       performAction:grey_tap()];
   NSString* titleIdentifier = @"Title Field_textField";
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(titleIdentifier)]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(@"Clear text")]
       performAction:grey_tap()];
 
   // Use '\n' to tap Done and dismiss the keyboard.
   NSString* bookmarkTitle = [NSString stringWithFormat:@"%@\n", title];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(titleIdentifier)]
       performAction:grey_typeText(bookmarkTitle)];
 
   // Dismiss the window.
-  [[EarlGrey selectElementWithMatcher:bookmarksDoneButton()]
+  [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
       performAction:grey_tap()];
 }
 
 // Waits for the bookmark model to be loaded in memory.
 + (void)waitForBookmarkModelLoaded:(BOOL)loaded {
   bookmarks::BookmarkModel* bookmarkModel =
       ios::BookmarkModelFactory::GetForBrowserState(
           chrome_test_util::GetOriginalBrowserState());
   GREYAssert(testing::WaitUntilConditionOrTimeout(
                  testing::kWaitForUIElementTimeout,
@@ skipping 282 matching lines @@
                     error:&error];
     return error == nil;
   };
   GREYAssert(testing::WaitUntilConditionOrTimeout(10, condition),
              @"Waiting for bookmark to go away");
 }
 
 // Adds a bookmark for the current tab. Must be called when on a tab.
 + (void)starCurrentTab {
   if (!IsCompact()) {
-    [[EarlGrey selectElementWithMatcher:starButton()] performAction:grey_tap()];
+    [[EarlGrey selectElementWithMatcher:StarButton()] performAction:grey_tap()];
   } else {
     [ChromeEarlGreyUI openToolsMenu];
-    [[EarlGrey selectElementWithMatcher:addBookmarkButton()]
+    [[EarlGrey selectElementWithMatcher:AddBookmarkButton()]
         performAction:grey_tap()];
   }
 }
 
 @end