Reland "Reland "[Empties] Enable the IllustratedEmptyStates field trial testing config.""

This is a reland of d777f5d0

Original change's description:
> Reland "[Empties] Enable the IllustratedEmptyStates field trial testing config."
> 
> This is a reland of 74b8ec6f
> 
> Original change's description:
> > [Empties] Enable the IllustratedEmptyStates field trial testing config.
> > 
> > Change-Id: I664fa63b5b69369cb69fb4b87463ba3bb4cfc94d
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2386295
> > Reviewed-by: Sergio Collazos <sczs@chromium.org>
> > Reviewed-by: Steven Holte <holte@chromium.org>
> > Commit-Queue: sebsg <sebsg@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#805136}
> 
> Change-Id: Ieb3e461efb4c55e7ef601417819cc4470e8fe4cc
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2401398
> Commit-Queue: sebsg <sebsg@chromium.org>
> Reviewed-by: Sergio Collazos <sczs@chromium.org>
> Reviewed-by: Ilya Sherman <isherman@chromium.org>
> Auto-Submit: sebsg <sebsg@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#807867}

Change-Id: I0c3a85ef61dc74064e9e9d49a27a5efe1e333452
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2418891Reviewed-by: Sergio Collazos <sczs@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Commit-Queue: sebsg <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809933}

ios/chrome/browser/ui/authentication/signin/signin_coordinator_egtest.mm

@@ -53,18 +53,35 @@ namespace {
 // Taps on the primary sign-in button in recent tabs, and scroll first, if
 // necessary.
 void TapOnPrimarySignInButtonInRecentTabs() {
-  id<GREYMatcher> matcher =
-      grey_allOf(PrimarySignInButton(), grey_sufficientlyVisible(), nil);
-  const CGFloat kPixelsToScroll = 300;
-  id<GREYAction> searchAction =
-      grey_scrollInDirection(kGREYDirectionDown, kPixelsToScroll);
-  GREYElementInteraction* interaction =
-      [[EarlGrey selectElementWithMatcher:matcher]
-             usingSearchAction:searchAction
+  [[[EarlGrey
+      selectElementWithMatcher:grey_allOf(PrimarySignInButton(),
+                                          grey_sufficientlyVisible(), nil)]
+         usingSearchAction:grey_scrollToContentEdge(kGREYContentEdgeBottom)
       onElementWithMatcher:
+          grey_allOf(grey_accessibilityID(
+                         kRecentTabsTableViewControllerAccessibilityIdentifier),
+                     grey_sufficientlyVisible(), nil)]
+      performAction:grey_tap()];
+}
+
+// Collapses the recently closed tabs section if the sign in promo is
+// inaccessible otherwise.
+void CollapseRecentlyClosedTabsSectionIfNecessary() {
+  NSError* error = nil;
+  [[EarlGrey selectElementWithMatcher:
                  grey_accessibilityID(
-                  kRecentTabsTableViewControllerAccessibilityIdentifier)];
-  [interaction performAction:grey_tap()];
+                     kRecentTabsTableViewControllerAccessibilityIdentifier)]
+      assertWithMatcher:chrome_test_util::ContentViewSmallerThanScrollView()
+                  error:&error];
+
+  if (error) {
+    [[EarlGrey selectElementWithMatcher:
+                   grey_allOf(chrome_test_util::ButtonWithAccessibilityLabel(
+                                  l10n_util::GetNSString(
+                                      IDS_IOS_RECENT_TABS_RECENTLY_CLOSED)),
+                              grey_sufficientlyVisible(), nil)]
+        performAction:grey_tap()];
+  }
 }
 
 // Returns a matcher for |userEmail| in IdentityChooserViewController.
@@ -448,6 +465,10 @@ void ChooseImportOrKeepDataSepareteDialog(id<GREYMatcher> choiceButtonMatcher) {
       [[EarlGrey selectElementWithMatcher:chrome_test_util::
                                               TabGridOtherDevicesPanelButton()]
           performAction:grey_tap()];
+
+      // TODO(crbug.com/1131479): Find a way to scroll the view instead.
+      CollapseRecentlyClosedTabsSectionIfNecessary();
+
       TapOnPrimarySignInButtonInRecentTabs();
       break;
   }

ios/chrome/browser/ui/authentication/signin_earl_grey_ui.mm

@@ -152,11 +152,15 @@ using chrome_test_util::SignOutAccountsButton;
 + (void)verifySigninPromoVisibleWithMode:(SigninPromoViewMode)mode
                              closeButton:(BOOL)closeButton {
   [ChromeEarlGreyUI waitForAppToIdle];
+
+  // The sign-in promo is not visible when showing illustrated empty states.
+  if (![ChromeEarlGrey isIllustratedEmptyStatesEnabled]) {
     [[EarlGrey
         selectElementWithMatcher:grey_allOf(
                                      grey_accessibilityID(kSigninPromoViewId),
                                      grey_sufficientlyVisible(), nil)]
         assertWithMatcher:grey_notNil()];
+  }
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(PrimarySignInButton(),
                                           grey_sufficientlyVisible(), nil)]
@@ -169,10 +173,13 @@ using chrome_test_util::SignOutAccountsButton;
           assertWithMatcher:grey_nil()];
       break;
     case SigninPromoViewModeWarmState:
+      if (![ChromeEarlGrey isIllustratedEmptyStatesEnabled]) {
         [[EarlGrey
             selectElementWithMatcher:grey_allOf(SecondarySignInButton(),
-                                              grey_sufficientlyVisible(), nil)]
+                                                grey_sufficientlyVisible(),
+                                                nil)]
             assertWithMatcher:grey_notNil()];
+      }
       break;
   }
   if (closeButton) {

ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_ui.mm

@@ -4,6 +4,7 @@
 
 #import "ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_ui.h"
 
+#include "base/ios/ios_util.h"
 #include "base/mac/foundation_util.h"
 #import "base/test/ios/wait_util.h"
 #include "build/build_config.h"
@@ -439,12 +440,19 @@ id<GREYMatcher> SearchIconButton() {
 }
 
 - (void)verifyEmptyBackgroundAppears {
-  id<GREYMatcher> emptyBackground =
-      grey_accessibilityID([ChromeEarlGrey isIllustratedEmptyStatesEnabled]
-                               ? kTableViewIllustratedEmptyViewID
-                               : kBookmarkEmptyStateExplanatoryLabelIdentifier);
-  [[EarlGrey selectElementWithMatcher:emptyBackground]
+  if ([ChromeEarlGrey isIllustratedEmptyStatesEnabled]) {
+    [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
+                                            kTableViewIllustratedEmptyViewID)]
+        assertWithMatcher:grey_notNil()];
+    [[EarlGrey selectElementWithMatcher:grey_text(l10n_util::GetNSString(
+                                            IDS_IOS_BOOKMARK_EMPTY_MESSAGE))]
+        assertWithMatcher:grey_sufficientlyVisible()];
+  } else {
+    [[EarlGrey
+        selectElementWithMatcher:
+            grey_accessibilityID(kBookmarkEmptyStateExplanatoryLabelIdentifier)]
         assertWithMatcher:grey_sufficientlyVisible()];
+  }
 }
 
 - (void)verifyEmptyState {
@@ -453,10 +461,10 @@ id<GREYMatcher> SearchIconButton() {
   id<GREYInteraction> searchBar =
       [EarlGrey selectElementWithMatcher:grey_accessibilityTrait(
                                              UIAccessibilityTraitSearchField)];
-  if ([ChromeEarlGrey isIllustratedEmptyStatesEnabled]) {
-    // With the illustrated empty state, the search bar should be hidden.
-    [searchBar assertWithMatcher:grey_nil()];
-  } else {
+  // TODO(crbug.com/1126982): Fix the search bar issue on iOS 12.4.
+  // The search bar should not be visible when the illustrated empty state is
+  // shown.
+  if (![ChromeEarlGrey isIllustratedEmptyStatesEnabled]) {
     [searchBar assertWithMatcher:grey_notNil()];
   }
 }

ios/chrome/browser/ui/bookmarks/bookmarks_egtest.mm

@@ -727,7 +727,7 @@ using chrome_test_util::TappableBookmarkNodeWithLabel;
   // Reopen bookmarks.
   [BookmarkEarlGreyUI openBookmarks];
 
-  if (base::FeatureList::IsEnabled(kIllustratedEmptyStates)) {
+  if ([ChromeEarlGrey isIllustratedEmptyStatesEnabled]) {
     // Ensure the root node is opened, by verifying that there isn't a Back
     // button in the navigation bar.
     [[EarlGrey selectElementWithMatcher:chrome_test_util::
@@ -834,7 +834,7 @@ using chrome_test_util::TappableBookmarkNodeWithLabel;
 - (void)testRootEmptyState {
   [BookmarkEarlGreyUI openBookmarks];
 
-  if (base::FeatureList::IsEnabled(kIllustratedEmptyStates)) {
+  if ([ChromeEarlGrey isIllustratedEmptyStatesEnabled]) {
     // When the user has no bookmarks, the root view should be an empty state.
     [BookmarkEarlGreyUI verifyEmptyState];
   } else {
@@ -862,7 +862,7 @@ using chrome_test_util::TappableBookmarkNodeWithLabel;
                                           BookmarksNavigationBarBackButton()]
       performAction:grey_tap()];
 
-  if (base::FeatureList::IsEnabled(kIllustratedEmptyStates)) {
+  if ([ChromeEarlGrey isIllustratedEmptyStatesEnabled]) {
     // When the user has no bookmarks, the root view should be an empty state.
     [BookmarkEarlGreyUI verifyEmptyState];
   } else {

ios/chrome/browser/ui/bookmarks/managed_bookmarks_egtest.mm

@@ -167,10 +167,7 @@ void SearchBookmarksForText(NSString* search_text) {
 - (void)testEmptyManagedBookmarks {
   [BookmarkEarlGreyUI openBookmarks];
 
-  // Mobile bookmarks exists.
-  [[EarlGrey selectElementWithMatcher:TappableBookmarkNodeWithLabel(
-                                          @"Mobile Bookmarks")]
-      assertWithMatcher:grey_notNil()];
+  [BookmarkEarlGreyUI verifyEmptyState];
 
   // Managed bookmarks folder does not exist.
   [[EarlGrey selectElementWithMatcher:TappableBookmarkNodeWithLabel(

ios/chrome/browser/ui/recent_tabs/recent_tabs_egtest.mm

@@ -152,8 +152,8 @@ id<GREYMatcher> TitleOfTestPage() {
                                                   IDS_HISTORY_TITLE)),
                                           grey_accessibilityTrait(
                                               UIAccessibilityTraitHeader),
-                                          nil)]
-      assertWithMatcher:grey_sufficientlyVisible()];
+                                          grey_sufficientlyVisible(), nil)]
+      assertWithMatcher:grey_notNil()];
 
   // Close History.
   id<GREYMatcher> exitMatcher =
@@ -167,6 +167,15 @@ id<GREYMatcher> TitleOfTestPage() {
 // Tests that the sign-in promo can be reloaded correctly.
 - (void)testRecentTabSigninPromoReloaded {
   OpenRecentTabsPanel();
+
+  // Scroll to sign-in promo, if applicable.
+  [[EarlGrey
+      selectElementWithMatcher:
+          grey_allOf(grey_accessibilityID(
+                         kRecentTabsTableViewControllerAccessibilityIdentifier),
+                     grey_sufficientlyVisible(), nil)]
+      performAction:grey_scrollToContentEdge(kGREYContentEdgeBottom)];
+
   // Sign-in promo should be visible with cold state.
   [SigninEarlGreyUI
       verifySigninPromoVisibleWithMode:SigninPromoViewModeColdState
@@ -185,6 +194,15 @@ id<GREYMatcher> TitleOfTestPage() {
 // crbug.com/776939
 - (void)testRecentTabSigninPromoReloadedWhileHidden {
   OpenRecentTabsPanel();
+
+  // Scroll to sign-in promo, if applicable
+  [[EarlGrey
+      selectElementWithMatcher:
+          grey_allOf(grey_accessibilityID(
+                         kRecentTabsTableViewControllerAccessibilityIdentifier),
+                     grey_sufficientlyVisible(), nil)]
+      performAction:grey_scrollToContentEdge(kGREYContentEdgeBottom)];
+
   [SigninEarlGreyUI
       verifySigninPromoVisibleWithMode:SigninPromoViewModeColdState
                            closeButton:NO];
@@ -206,6 +224,13 @@ id<GREYMatcher> TitleOfTestPage() {
   // Tap on "Other Devices", to show the sign-in promo.
   [[EarlGrey selectElementWithMatcher:otherDevicesMatcher]
       performAction:grey_tap()];
+  // Scroll to sign-in promo, if applicable
+  [[EarlGrey
+      selectElementWithMatcher:
+          grey_allOf(grey_accessibilityID(
+                         kRecentTabsTableViewControllerAccessibilityIdentifier),
+                     grey_sufficientlyVisible(), nil)]
+      performAction:grey_scrollToContentEdge(kGREYContentEdgeBottom)];
   [SigninEarlGreyUI
       verifySigninPromoVisibleWithMode:SigninPromoViewModeWarmState
                            closeButton:NO];
@@ -290,6 +315,14 @@ id<GREYMatcher> TitleOfTestPage() {
     [illustratedCell assertWithMatcher:grey_nil()];
   }
 
+  // Scroll to sign-in promo, if applicable
+  [[EarlGrey
+      selectElementWithMatcher:
+          grey_allOf(grey_accessibilityID(
+                         kRecentTabsTableViewControllerAccessibilityIdentifier),
+                     grey_sufficientlyVisible(), nil)]
+      performAction:grey_scrollToContentEdge(kGREYContentEdgeBottom)];
+
   [SigninEarlGreyUI
       verifySigninPromoVisibleWithMode:SigninPromoViewModeColdState
                            closeButton:NO];

ios/chrome/browser/ui/settings/google_services/accounts_table_egtest.mm

@@ -226,11 +226,17 @@ id<GREYMatcher> NoBookmarksLabel() {
 
   // Open the Bookmarks screen on the Tools menu.
   [BookmarkEarlGreyUI openBookmarks];
-  [BookmarkEarlGreyUI openMobileBookmarks];
 
   // Assert that there are no bookmarks.
+  if ([ChromeEarlGrey isIllustratedEmptyStatesEnabled]) {
+    // The empty background appears in the root directory if the leaf folders
+    // are empty.
+    [BookmarkEarlGreyUI verifyEmptyBackgroundAppears];
+  } else {
+    [BookmarkEarlGreyUI openMobileBookmarks];
     [[EarlGrey selectElementWithMatcher:NoBookmarksLabel()]
         assertWithMatcher:grey_notNil()];
+  }
 }
 
 // Tests that signing out from a managed user account clears the user's data.
@@ -249,11 +255,17 @@ id<GREYMatcher> NoBookmarksLabel() {
 
   // Open the Bookmarks screen on the Tools menu.
   [BookmarkEarlGreyUI openBookmarks];
-  [BookmarkEarlGreyUI openMobileBookmarks];
 
   // Assert that there are no bookmarks.
+  if ([ChromeEarlGrey isIllustratedEmptyStatesEnabled]) {
+    // The empty background appears in the root directory if the leaf folders
+    // are empty.
+    [BookmarkEarlGreyUI verifyEmptyBackgroundAppears];
+  } else {
+    [BookmarkEarlGreyUI openMobileBookmarks];
     [[EarlGrey selectElementWithMatcher:NoBookmarksLabel()]
         assertWithMatcher:grey_notNil()];
+  }
 }
 
 // Tests that given two accounts A and B that are available on the device -

testing/variations/fieldtrial_testing_config.json

@@ -3595,6 +3595,21 @@
             ]
         }
     ],
+    "IllustratedEmptyStates": [
+        {
+            "platforms": [
+                "ios"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "IllustratedEmptyStates"
+                    ]
+                }
+            ]
+        }
+    ],
     "IncludeBetaForumMenuItem": [
         {
             "platforms": [