[ObjC ARC] Converts ios/chrome/browser/ui/bookmarks:eg_tests to ARC.

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"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 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);
@@ skipping 105 matching lines @@
       "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(
                                           expectedURLContent)]
       assertWithMatcher:grey_notNil()];
 
   // Add the bookmark from the UI.
-  [[self class] bookmarkCurrentTabWithTitle:bookmarkTitle];
+  [BookmarksTestCase bookmarkCurrentTabWithTitle:bookmarkTitle];
 
   // Verify the bookmark is set.
-  [[self class] assertBookmarksWithTitle:bookmarkTitle expectedCount:1];
+  [BookmarksTestCase 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)]
       performAction:grey_tap()];
 
   // Verify the bookmark is not in the BookmarkModel.
-  [[self class] assertBookmarksWithTitle:bookmarkTitle expectedCount:0];
+  [BookmarksTestCase 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()]
         performAction:grey_tap()];
   }
 
   // Close the opened tab.
-  base::scoped_nsobject<GenericChromeCommand> command(
-      [[GenericChromeCommand alloc] initWithTag:IDC_CLOSE_TAB]);
+  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];
+  [BookmarksTestCase addBookmark:bookmarkURL withTitle:bookmarkTitle];
 
   // Open the UI for Bookmarks.
-  [[self class] openMobileBookmarks];
+  [BookmarksTestCase openMobileBookmarks];
 
   // Verify bookmark is visible.
   [[EarlGrey
       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)]
       performAction:grey_tap()];
   [[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");
   [ChromeEarlGrey loadURL:firstURL];
   chrome_test_util::OpenNewTab();
   [ChromeEarlGrey loadURL:secondURL];
 
-  [[self class] bookmarkCurrentTabWithTitle:@"my bookmark"];
-  [[self class] assertBookmarksWithTitle:@"my bookmark" expectedCount:1];
+  [BookmarksTestCase bookmarkCurrentTabWithTitle:@"my bookmark"];
+  [BookmarksTestCase assertBookmarksWithTitle:@"my bookmark" expectedCount:1];
 }
 
 // Try navigating to the bookmark screen, and selecting a bookmark.
 - (void)testSelectBookmark {
-  [[self class] setupStandardBookmarks];
-  [[self class] openMobileBookmarks];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openMobileBookmarks];
 
   // 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())];
 }
 
 // Try deleting a bookmark, then undoing that delete.
 - (void)testUndoDeleteBookmark {
-  [[self class] setupStandardBookmarks];
-  [[self class] openMobileBookmarks];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openMobileBookmarks];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Second URL Info")]
       performAction:grey_tap()];
 
   // Delete it.
   [[EarlGrey selectElementWithMatcher:ActionSheet(ActionDelete)]
       performAction:grey_tap()];
 
   // Wait until it's gone.
-  [[self class] waitForDeletionOfBookmarkWithTitle:@"Second URL"];
+  [BookmarksTestCase 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];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase 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)]
       performAction:grey_tap()];
 
   // Delete it.
@@ skipping 15 matching lines @@
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Undo")]
       performAction:grey_tap()];
 
   // Verify it's back.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Second URL")]
       assertWithMatcher:grey_notNil()];
 }
 
 // Try moving bookmarks, then undoing that move.
 - (void)testUndoMoveBookmark {
-  [[self class] setupStandardBookmarks];
-  [[self class] openMobileBookmarks];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openMobileBookmarks];
 
   // Verify that folder 2 only has 1 child.
-  [[self class] assertChildCount:1 ofFolderWithName:@"Folder 2"];
+  [BookmarksTestCase 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)]
       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()];
 
   // Pick the destination.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder 2")]
       performAction:grey_tap()];
 
   // Wait for undo to show up (there is a 300ms delay for the user to see the
   // change).
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Undo")]
       assertWithMatcher:grey_sufficientlyVisible()];
 
   // Verify that folder 2 has 3 children now, and that they are no longer
   // visible.
-  [[self class] assertChildCount:3 ofFolderWithName:@"Folder 2"];
+  [BookmarksTestCase assertChildCount:3 ofFolderWithName:@"Folder 2"];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Second URL")]
       assertWithMatcher:grey_notVisible()];
 
   // Press undo.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Undo")]
       performAction:grey_tap()];
 
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
 
   // Verify it's back.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Second URL")]
       assertWithMatcher:grey_notNil()];
 
   // Verify that folder 2 is back to one child.
-  [[self class] assertChildCount:1 ofFolderWithName:@"Folder 2"];
+  [BookmarksTestCase assertChildCount:1 ofFolderWithName:@"Folder 2"];
 }
 
 - (void)testLabelUpdatedUponMove {
-  [[self class] setupStandardBookmarks];
-  [[self class] openMobileBookmarks];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase 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)]
       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];
+  [BookmarksTestCase 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(
                                           expectedURLContent)]
       assertWithMatcher:grey_notNil()];
 
-  [[self class] starCurrentTab];
+  [BookmarksTestCase starCurrentTab];
 
   // Verify the snackbar title.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(@"Bookmarked")]
       assertWithMatcher:grey_notNil()];
 
   // Tap on the snackbar.
   NSString* snackbarLabel =
       l10n_util::GetNSString(IDS_IOS_NAVIGATION_BAR_EDIT_BUTTON);
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(snackbarLabel)]
       performAction:grey_tap()];
 
   // Verify that the newly-created bookmark is in the BookmarkModel.
-  [[self class]
+  [BookmarksTestCase
       assertBookmarksWithTitle:base::SysUTF8ToNSString(expectedURLContent)
                  expectedCount:1];
 
   // Verify that the editor is present.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Single Bookmark Editor")]
       assertWithMatcher:grey_notNil()];
 
-  [[self class] assertFolderName:@"Mobile Bookmarks"];
+  [BookmarksTestCase assertFolderName:@"Mobile Bookmarks"];
 
   // Tap the Folder button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Change Folder")]
       performAction:grey_tap()];
 
   // Create a new folder with default name.
-  [[self class] addFolderWithName:nil];
+  [BookmarksTestCase addFolderWithName:nil];
 
   // Verify that the editor is present.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Single Bookmark Editor")]
       assertWithMatcher:grey_notNil()];
 
-  [[self class] assertFolderExists:@"New Folder"];
+  [BookmarksTestCase assertFolderExists:@"New Folder"];
 }
 
 // Tests that changing a folder's title in edit mode works as expected.
 - (void)testChangeFolderTitle {
   NSString* existingFolderTitle = @"Folder 1";
   NSString* newFolderTitle = @"New Folder Title";
 
-  [[self class] setupStandardBookmarks];
-  [[self class] openMobileBookmarks];
-  [[self class] openEditBookmarkFolderWithFolderTitle:existingFolderTitle];
-  [[self class] renameBookmarkFolderWithFolderTitle:newFolderTitle];
-  [[self class] closeEditBookmarkFolder];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openMobileBookmarks];
+  [BookmarksTestCase openEditBookmarkFolderWithFolderTitle:existingFolderTitle];
+  [BookmarksTestCase renameBookmarkFolderWithFolderTitle:newFolderTitle];
+  [BookmarksTestCase closeEditBookmarkFolder];
 
   if (IsCompact()) {
     // Exit from bookmarks modal. IPad shows bookmarks in tab.
     [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
   }
 
   // Verify that the change has been made.
-  [[self class] openMobileBookmarks];
+  [BookmarksTestCase 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];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase 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)]
       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"];
+  [BookmarksTestCase 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()]
       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];
+  [BookmarksTestCase assertBookmarksWithTitle:bookmarkedURLString
+                                expectedCount:0];
   // Open the page.
   std::string expectedURLContent = bookmarkedURL.GetContent();
   [ChromeEarlGrey loadURL:bookmarkedURL];
   [[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"];
+  [BookmarksTestCase assertChildCount:1 ofFolderWithName:@"Sticky Folder"];
 
   // Bookmark the page.
-  [[self class] starCurrentTab];
+  [BookmarksTestCase starCurrentTab];
 
   // Verify the snackbar title.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(
                                           @"Bookmarked to Sticky Folder")]
       assertWithMatcher:grey_sufficientlyVisible()];
 
   // Verify that the newly-created bookmark is in the BookmarkModel.
-  [[self class] assertBookmarksWithTitle:bookmarkedURLString expectedCount:1];
+  [BookmarksTestCase assertBookmarksWithTitle:bookmarkedURLString
+                                expectedCount:1];
 
   // Verify that the folder has now two elements.
-  [[self class] assertChildCount:2 ofFolderWithName:@"Sticky Folder"];
+  [BookmarksTestCase assertChildCount:2 ofFolderWithName:@"Sticky Folder"];
 }
 
 // Tests that changes to the parent folder from the Single Bookmark Controller
 // are saved to the bookmark only when saving the results.
 - (void)testMoveDoesSaveOnSave {
-  [[self class] setupStandardBookmarks];
-  [[self class] openTopLevelBookmarksFolder];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase 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)]
       performAction:grey_tap()];
 
   // Tap the Folder button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Change Folder")]
       performAction:grey_tap()];
 
   // Create a new folder.
-  [[self class] addFolderWithName:nil];
+  [BookmarksTestCase 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"];
+  [BookmarksTestCase assertChildCount:0 ofFolderWithName:@"New Folder"];
 
   // Tap the Done button.
   [[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"];
+  [BookmarksTestCase 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"];
+  [BookmarksTestCase assertChildCount:1 ofFolderWithName:@"New Folder"];
 }
 
 // Test thats editing a single bookmark correctly persists data.
 - (void)testSingleBookmarkEdit {
-  [[self class] setupStandardBookmarks];
-  [[self class] openTopLevelBookmarksFolder];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase 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)]
       performAction:grey_tap()];
 
   // Replace the title field with new text.
@@ skipping 21 matching lines @@
   // Dismiss editor.
   [[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")]
       assertWithMatcher:grey_sufficientlyVisible()];
-  [[self class] assertExistenceOfBookmarkWithURL:@"http://www.a.fr" name:@"n5"];
+  [BookmarksTestCase 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];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase 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)]
       performAction:grey_tap()];
 
   // Replace the title field with new text.
@@ skipping 21 matching lines @@
   // 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")]
       assertWithMatcher:grey_notVisible()];
-  [[self class] assertAbsenceOfBookmarkWithURL:@"http://www.a.fr"];
+  [BookmarksTestCase 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];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase 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()]
       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)]
       performAction:grey_tap()];
 
   // Dismiss the editor screen.
   [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
       performAction:grey_tap()];
 }
 
 // Tests the editing of a folder.
 - (void)testEditFolder {
-  [[self class] setupStandardBookmarks];
-  [[self class] openBookmarkFolder:@"Folder 1"];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openBookmarkFolder:@"Folder 1"];
 
   // Tap the Edit button in the navigation bar.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Edit_navigation_bar")]
       performAction:grey_tap()];
 
   // Change the title.
   // 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_textField")]
       performAction:grey_clearText()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Title_textField")]
       performAction:grey_typeText(@"Renamed Folder")];
 
   // Cancel without saving.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Cancel")]
       performAction:grey_tap()];
 
   // Check that Folder 1 still exists at this name, and Renamed Folder doesn't.
-  [[self class] assertFolderExistsWithTitle:@"Folder 1"];
-  [[self class] assertFolderDoesntExistWithTitle:@"Renamed Folder"];
+  [BookmarksTestCase assertFolderExistsWithTitle:@"Folder 1"];
+  [BookmarksTestCase assertFolderDoesntExistWithTitle:@"Renamed Folder"];
 
   // Tap the Edit button in the navigation bar.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Edit_navigation_bar")]
       performAction:grey_tap()];
 
   // Change the title.
   // 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_textField")]
       performAction:grey_clearText()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Title_textField")]
       performAction:grey_typeText(@"Renamed Folder")];
 
   // Save.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Save")]
       performAction:grey_tap()];
 
   // Check that Folder 1 doesn't exist and Renamed Folder does.
-  [[self class] assertFolderDoesntExistWithTitle:@"Folder 1"];
-  [[self class] assertFolderExistsWithTitle:@"Renamed Folder"];
+  [BookmarksTestCase assertFolderDoesntExistWithTitle:@"Folder 1"];
+  [BookmarksTestCase assertFolderExistsWithTitle:@"Renamed Folder"];
 }
 
 // Tests the deletion of a folder.
 - (void)testDeleteFolder {
-  [[self class] setupStandardBookmarks];
-  [[self class] openBookmarkFolder:@"Folder 1"];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openBookmarkFolder:@"Folder 1"];
 
   // Delete the folder.
-  [[self class] deleteSelectedFolder];
+  [BookmarksTestCase deleteSelectedFolder];
 
   // Check that the folder doesn't exist anymore.
-  [[self class] assertFolderDoesntExistWithTitle:@"Folder 1"];
+  [BookmarksTestCase 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"];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openBookmarkFolder:@"Folder 1"];
   [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabel(@"Folder 2")]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabel(@"Folder 3")]
       performAction:grey_tap()];
 
   // Delete the folder.
-  [[self class] deleteSelectedFolder];
+  [BookmarksTestCase 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"];
+  [BookmarksTestCase assertChildCount:0 ofFolderWithName:@"Folder 2"];
+  [BookmarksTestCase assertFolderDoesntExistWithTitle:@"Folder 3"];
+  [BookmarksTestCase 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"];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openBookmarkFolder:@"Folder 1"];
   [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabel(@"Folder 2")]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:ButtonWithAccessibilityLabel(@"Folder 3")]
       performAction:grey_tap()];
 
   // Remove the parent programmatically.
-  [[self class] removeBookmarkWithTitle:@"Folder 2"];
+  [BookmarksTestCase 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(
                                        @"BookmarkNavigationBar")),
                                    grey_descendant(grey_text(@"Folder 1")),
                                    nil)]
       assertWithMatcher:grey_sufficientlyVisible()];
-  [[self class] assertChildCount:0 ofFolderWithName:@"Folder 1"];
+  [BookmarksTestCase assertChildCount:0 ofFolderWithName:@"Folder 1"];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(@"Folder 2")]
       assertWithMatcher:grey_notVisible()];
-  [[self class] assertFolderDoesntExistWithTitle:@"Folder 2"];
-  [[self class] assertFolderDoesntExistWithTitle:@"Folder 3"];
+  [BookmarksTestCase assertFolderDoesntExistWithTitle:@"Folder 2"];
+  [BookmarksTestCase assertFolderDoesntExistWithTitle:@"Folder 3"];
 
   // Check that the selected folder in the menu is Folder 1.
   if (IsCompact()) {
     // Opens the bookmark manager sidebar on handsets.
     [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Menu")]
         performAction:grey_tap()];
   }
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(
                                    grey_kindOfClass(
                                        NSClassFromString(@"BookmarkMenuCell")),
                                    grey_descendant(grey_text(@"Folder 1")),
                                    nil)]
       assertWithMatcher:grey_sufficientlyVisible()];
 }
 
 // Tests that the menu button changes to a back button as expected when browsing
 // nested folders.
 - (void)testBrowseNestedFolders {
-  [[self class] setupStandardBookmarks];
-  [[self class] openMobileBookmarks];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openMobileBookmarks];
 
   // Navigate down the nested folders.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder 1")]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder 2")]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder 3")]
       performAction:grey_tap()];
 
   // Verify the back button is visible to be able to go back to parent.
@@ skipping 18 matching lines @@
 
   if (IsCompact()) {
     // Verify menu button reappears.
     [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Menu")]
         assertWithMatcher:grey_sufficientlyVisible()];
   }
 }
 
 // Tests moving a bookmark into a new folder created in the moving process.
 - (void)testCreateNewFolderWhileMovingBookmark {
-  [[self class] setupStandardBookmarks];
-  [[self class] openMobileBookmarks];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase 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)]
       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"];
+  [BookmarksTestCase
+      renameBookmarkFolderWithFolderTitle:@"Title For New Folder"];
 
   // Verify current parent folder (Change Folder) is Bookmarks folder.
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(
                                    grey_accessibilityID(@"Change Folder"),
                                    grey_accessibilityLabel(@"Mobile Bookmarks"),
                                    nil)]
       assertWithMatcher:grey_sufficientlyVisible()];
 
   // Choose new parent folder (Change Folder).
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Change Folder")]
       performAction:grey_tap()];
 
   // Verify folder picker UI is displayed.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder Picker")]
       assertWithMatcher:grey_sufficientlyVisible()];
 
   // Verify Folder 2 only has one item.
-  [[self class] assertChildCount:1 ofFolderWithName:@"Folder 2"];
+  [BookmarksTestCase assertChildCount:1 ofFolderWithName:@"Folder 2"];
 
   // Select Folder 2 as new Change Folder.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder 2")]
       performAction:grey_tap()];
 
   // Verify folder picker is dismissed and folder creator is now visible.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder Creator")]
       assertWithMatcher:grey_sufficientlyVisible()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder Picker")]
       assertWithMatcher:grey_notVisible()];
@@ skipping 11 matching lines @@
 
   // Verify all folder flow UI is now closed.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder Creator")]
       assertWithMatcher:grey_notVisible()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder Picker")]
       assertWithMatcher:grey_notVisible()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Folder Editor")]
       assertWithMatcher:grey_notVisible()];
 
   // Verify new folder has been created under Folder 2.
-  [[self class] assertChildCount:2 ofFolderWithName:@"Folder 2"];
+  [BookmarksTestCase assertChildCount:2 ofFolderWithName:@"Folder 2"];
 
   // Verify new folder has one bookmark.
-  [[self class] assertChildCount:1 ofFolderWithName:@"Title For New Folder"];
+  [BookmarksTestCase assertChildCount:1
+                     ofFolderWithName:@"Title For New Folder"];
 }
 
 // Navigates to a deeply nested folder, deletes its root ancestor and checks
 // that the UI is on the top level folder.
 - (void)testDeleteRootFolder {
-  [[self class] setupStandardBookmarks];
-  [[self class] openBookmarkFolder:@"Folder 1"];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openBookmarkFolder:@"Folder 1"];
   [[EarlGrey selectElementWithMatcher:grey_text(@"Folder 2")]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:grey_text(@"Folder 3")]
       performAction:grey_tap()];
 
-  [[self class] removeBookmarkWithTitle:@"Folder 1"];
+  [BookmarksTestCase removeBookmarkWithTitle:@"Folder 1"];
 
   NSString* rootFolderTitle = nil;
   rootFolderTitle = @"Mobile Bookmarks";
 
   // Folder 2 and 3 are now deleted, UI should have moved to top level folder.
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(
                                    grey_kindOfClass(NSClassFromString(
                                        @"BookmarkNavigationBar")),
                                    grey_descendant(grey_text(rootFolderTitle)),
@@ skipping 26 matching lines @@
   }
 
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(@"Folder 1")]
       assertWithMatcher:grey_notVisible()];
 }
 
 // Tests that keyboard commands are registered when a bookmark is added with the
 // new bookmark UI as it shows only a snackbar.
 - (void)testKeyboardCommandsRegistered_AddBookmark {
   // Add the bookmark.
-  [[self class] starCurrentTab];
+  [BookmarksTestCase starCurrentTab];
   GREYAssertTrue(chrome_test_util::GetRegisteredKeyCommandsCount() > 0,
                  @"Some keyboard commands are registered.");
 }
 
 // Tests that keyboard commands are not registered when a bookmark is edited, as
 // the edit screen is presented modally.
 - (void)testKeyboardCommandsNotRegistered_EditBookmark {
-  [[self class] setupStandardBookmarks];
-  [[self class] openMobileBookmarks];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase 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()];
   } else {
     [ChromeEarlGreyUI openToolsMenu];
     [[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];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openTopLevelBookmarksFolder];
 
   // We are going to set the PromoAlreadySeen preference. Set a teardown handler
   // to reset it.
   [self setTearDownHandler:^{
-    [[self class] setPromoAlreadySeen:NO];
+    [BookmarksTestCase setPromoAlreadySeen:NO];
   }];
   // Check that promo is visible.
-  [[self class] verifyPromoAlreadySeen:NO];
+  [BookmarksTestCase verifyPromoAlreadySeen:NO];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"promo_view")]
       assertWithMatcher:grey_notNil()];
 
   // Tap the dismiss button.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"promo_no_thanks_button")]
       performAction:grey_tap()];
 
   // Wait until promo is gone.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"promo_view")]
       assertWithMatcher:grey_notVisible()];
 
   // Check that the promo already seen state is updated.
-  [[self class] verifyPromoAlreadySeen:YES];
+  [BookmarksTestCase verifyPromoAlreadySeen:YES];
 }
 
 // Tests that tapping Sign in on the promo make the Sign in sheet appear and
 // the promo still appears after dismissing the Sign in sheet.
 - (void)testUIPromoSignIn {
-  [[self class] setupStandardBookmarks];
-  [[self class] openTopLevelBookmarksFolder];
+  [BookmarksTestCase setupStandardBookmarks];
+  [BookmarksTestCase openTopLevelBookmarksFolder];
   // Set up a fake identity.
   ChromeIdentity* identity =
       [FakeChromeIdentity identityWithEmail:@"fakefoo@egmail.com"
                                      gaiaID:@"fakefoopassword"
                                        name:@"Fake Foo"];
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()->AddIdentity(
       identity);
 
   // Check that promo is visible.
-  [[self class] verifyPromoAlreadySeen:NO];
+  [BookmarksTestCase verifyPromoAlreadySeen:NO];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"promo_view")]
       assertWithMatcher:grey_notNil()];
 
   // Tap the Sign in button.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"promo_sign_in_button")]
       performAction:grey_tap()];
 
   // Tap the CANCEL button.
   [[EarlGrey selectElementWithMatcher:
                  grey_buttonTitle([l10n_util::GetNSString(
                      IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SKIP_BUTTON)
                      uppercaseString])] performAction:grey_tap()];
 
   // Check that the bookmarks UI reappeared and the cell is still here.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"promo_view")]
       assertWithMatcher:grey_notNil()];
 
-  [[self class] verifyPromoAlreadySeen:NO];
+  [BookmarksTestCase verifyPromoAlreadySeen:NO];
 }
 
 // Tests that all elements on the bookmarks landing page are accessible.
 - (void)testAccessibilityOnBookmarksLandingPage {
-  [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
+  [BookmarksTestCase openMobileBookmarksPrepopulatedWithOneBookmark];
 
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   if (IsCompact()) {
     // Exit from bookmarks modal. IPad shows bookmarks in tab.
     [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
   }
 }
 
 // Tests that all elements on the bookmarks Edit page are accessible.
 - (void)testAccessibilityOnBookmarksEditPage {
-  [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
+  [BookmarksTestCase openMobileBookmarksPrepopulatedWithOneBookmark];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:MoreMenuButton()]
       performAction:grey_tap()];
 
   // Tap the edit action.
   [[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()]
         performAction:grey_tap()];
     [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
   }
 }
 
 // Tests that all elements on the bookmarks Move page are accessible.
 - (void)testAccessibilityOnBookmarksMovePage {
-  [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
+  [BookmarksTestCase openMobileBookmarksPrepopulatedWithOneBookmark];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:MoreMenuButton()]
       performAction:grey_tap()];
 
   // Tap the Move action.
   [[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()]
         performAction:grey_tap()];
     [[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];
+  [BookmarksTestCase openMobileBookmarksPrepopulatedWithOneBookmark];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:MoreMenuButton()]
       performAction:grey_tap()];
 
   // Tap the Move action.
   [[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()]
         performAction:grey_tap()];
     [[EarlGrey selectElementWithMatcher:BookmarksDoneButton()]
         performAction:grey_tap()];
   }
 }
 
 // Tests that all elements on bookmarks Delete and Undo are accessible.
 - (void)testAccessibilityOnBookmarksDeleteUndo {
-  [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
+  [BookmarksTestCase openMobileBookmarksPrepopulatedWithOneBookmark];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:MoreMenuButton()]
       performAction:grey_tap()];
 
   // Tap the Delete action.
   [[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()]
         performAction:grey_tap()];
   }
 }
 
 // Tests that all elements on the bookmarks Select page are accessible.
 - (void)testAccessibilityOnBookmarksSelect {
-  [[self class] openMobileBookmarksPrepopulatedWithOneBookmark];
+  [BookmarksTestCase openMobileBookmarksPrepopulatedWithOneBookmark];
 
   // Load the menu for a bookmark.
   [[EarlGrey selectElementWithMatcher:MoreMenuButton()]
       performAction:grey_tap()];
 
   // Tap the Select action.
   [[EarlGrey selectElementWithMatcher:ActionSheet(ActionSelect)]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   // Dismiss selector with Cancel button.
@@ skipping 46 matching lines @@
   [BookmarksTestCase openBookmarkFolder:@"Mobile Bookmarks"];
 }
 
 // Adds a bookmark, then navigates to the bookmark manager UI, and
 // selects MobileBookmarks.
 + (void)openMobileBookmarksPrepopulatedWithOneBookmark {
   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];
+  [BookmarksTestCase addBookmark:bookmarkURL withTitle:bookmarkTitle];
 
   // Open the UI for Bookmarks.
-  [[self class] openMobileBookmarks];
+  [BookmarksTestCase openMobileBookmarks];
 
   // Verify bookmark is visible.
   [[EarlGrey
       selectElementWithMatcher:ButtonWithAccessibilityLabel(bookmarkTitle)]
       assertWithMatcher:grey_sufficientlyVisible()
                   error:nil];
 }
 
 // Navigates to the edit folder UI for |folderTitle|.
 + (void)openEditBookmarkFolderWithFolderTitle:(NSString*)folderTitle {
@@ skipping 24 matching lines @@
   // Type in the new title and use '\n' to dismiss the keyboard.
   NSString* folderTitleWithNewLine =
       [NSString stringWithFormat:@"%@\n", folderTitle];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(titleIdentifier)]
       performAction:grey_typeText(folderTitleWithNewLine)];
 }
 
 // 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];
+  [BookmarksTestCase waitForBookmarkModelLoaded:YES];
   // Add the bookmark from the UI.
-  [[self class] starCurrentTab];
+  [BookmarksTestCase starCurrentTab];
 
   // Set the bookmark name.
   [[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()];
 
@@ skipping 94 matching lines @@
   GREYAssert(folder, @"No folder named %@", name);
   GREYAssertEqual(
       folder->child_count(), count,
       @"Unexpected number of children in folder '%@': %d instead of %d", name,
       folder->child_count(), count);
 }
 
 // Adds a bookmark with the given |url| and |title| into the Mobile Bookmarks
 // folder.
 + (void)addBookmark:(const GURL)url withTitle:(NSString*)title {
-  [[self class] waitForBookmarkModelLoaded:YES];
+  [BookmarksTestCase waitForBookmarkModelLoaded:YES];
   bookmarks::BookmarkModel* bookmark_model =
       ios::BookmarkModelFactory::GetForBrowserState(
           chrome_test_util::GetOriginalBrowserState());
   bookmark_model->AddURL(bookmark_model->mobile_node(), 0,
                          base::SysNSStringToUTF16(title), url);
 }
 
 // Creates a new folder starting from the folder picker.
 // Passing a |name| of 0 length will use the default value.
 + (void)addFolderWithName:(NSString*)name {
@@ skipping 23 matching lines @@
         performAction:grey_typeText(name)];
   }
 
   // Tap the Save button.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Save")]
       performAction:grey_tap()];
 }
 
 // Loads a set of default bookmarks in the model for the tests to use.
 + (void)setupStandardBookmarks {
-  [[self class] waitForBookmarkModelLoaded:YES];
+  [BookmarksTestCase waitForBookmarkModelLoaded:YES];
 
   bookmarks::BookmarkModel* bookmark_model =
       ios::BookmarkModelFactory::GetForBrowserState(
           chrome_test_util::GetOriginalBrowserState());
 
   const GURL firstURL = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/pony.html");
   NSString* firstTitle = @"First URL";
   bookmark_model->AddURL(bookmark_model->mobile_node(), 0,
                          base::SysNSStringToUTF16(firstTitle), firstURL);
@@ skipping 82 matching lines @@
       continue;
     // This is a folder.
     if (bookmark->GetTitle() == folderTitle16)
       return YES;
   }
   return NO;
 }
 
 // Asserts that there is a bookmark folder with the given title.
 + (void)assertFolderExistsWithTitle:(NSString*)folderTitle {
-  GREYAssert([[self class] folderExistsWithTitle:folderTitle],
+  GREYAssert([BookmarksTestCase folderExistsWithTitle:folderTitle],
              @"There is no folder named %@", folderTitle);
 }
 
 // Asserts that there is no bookmark folder with the given title.
 + (void)assertFolderDoesntExistWithTitle:(NSString*)folderTitle {
-  GREYAssert(![[self class] folderExistsWithTitle:folderTitle],
+  GREYAssert(![BookmarksTestCase folderExistsWithTitle:folderTitle],
              @"There is a folder named %@", folderTitle);
 }
 
 // Deletes via the UI the currently focused folder. This must be called once
 // already in a non permanent folder (i.e. not Mobile Bookmarks, etc.).
 + (void)deleteSelectedFolder {
   // Enter edit mode.
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(@"Edit_navigation_bar")]
       performAction:grey_tap()];
@@ skipping 40 matching lines @@
   if (!IsCompact()) {
     [[EarlGrey selectElementWithMatcher:StarButton()] performAction:grey_tap()];
   } else {
     [ChromeEarlGreyUI openToolsMenu];
     [[EarlGrey selectElementWithMatcher:AddBookmarkButton()]
         performAction:grey_tap()];
   }
 }
 
 @end