[EG2] Convert RL test to EG2

Change-Id: I8e294d3c99382336ec425c67bb43a29cabdf89df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1889871
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712085}

ios/chrome/browser/reading_list/reading_list_download_service.cc

@@ -19,6 +19,7 @@
 #include "components/reading_list/core/reading_list_model.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/reading_list/reading_list_distiller_page_factory.h"
+#include "net/base/network_change_notifier.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 
 namespace {
@@ -70,8 +71,7 @@ ReadingListDownloadService::ReadingListDownloadService(
         distiller_page_factory)
     : reading_list_model_(reading_list_model),
       chrome_profile_path_(chrome_profile_path),
-      had_connection_(
-          !GetApplicationContext()->GetNetworkConnectionTracker()->IsOffline()),
+      had_connection_(!net::NetworkChangeNotifier::IsOffline()),
       distiller_page_factory_(std::move(distiller_page_factory)),
       distiller_factory_(std::move(distiller_factory)),
       weak_ptr_factory_(this) {
@@ -208,7 +208,7 @@ void ReadingListDownloadService::DownloadEntry(const GURL& url) {
       entry->DistilledState() == ReadingListEntry::PROCESSED || entry->IsRead())
     return;
 
-  if (GetApplicationContext()->GetNetworkConnectionTracker()->IsOffline()) {
+  if (net::NetworkChangeNotifier::IsOffline()) {
     // There is no connection, save it for download only if we did not exceed
     // the maximaxum number of tries.
     if (entry->FailedDownloadCounter() < kNumberOfFailsBeforeWifiOnly)

ios/chrome/browser/ui/reading_list/BUILD.gn

@@ -69,6 +69,14 @@ source_set("reading_list") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
+source_set("reading_list_constants") {
+  sources = [
+    "reading_list_constants.h",
+    "reading_list_constants.mm",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("reading_list_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -85,8 +93,6 @@ source_set("reading_list_ui") {
     "reading_list_table_view_controller.h",
     "reading_list_table_view_controller.mm",
     "reading_list_toolbar_button_commands.h",
-    "reading_list_toolbar_button_identifiers.h",
-    "reading_list_toolbar_button_identifiers.mm",
     "reading_list_toolbar_button_manager.h",
     "reading_list_toolbar_button_manager.mm",
     "reading_list_ui_distillation_status.h",
@@ -94,6 +100,7 @@ source_set("reading_list_ui") {
     "text_badge_view.mm",
   ]
   deps = [
+    ":reading_list_constants",
     "resources:reading_list_empty_state",
     "resources:reading_list_empty_state_new",
     "resources:reading_list_tools_icon",
@@ -158,6 +165,7 @@ source_set("unit_tests") {
 }
 
 source_set("eg_tests") {
+  defines = [ "CHROME_EARL_GREY_1" ]
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
@@ -165,7 +173,9 @@ source_set("eg_tests") {
   ]
   deps = [
     ":reading_list",
+    ":reading_list_constants",
     ":reading_list_ui",
+    ":test_support",
     "//base",
     "//base/test:test_support",
     "//components/reading_list/core",
@@ -176,6 +186,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:constants",
     "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/table_view:views",
     "//ios/chrome/browser/ui/table_view/cells",
@@ -196,3 +207,88 @@ source_set("eg_tests") {
     "XCTest.framework",
   ]
 }
+
+source_set("eg2_tests") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [
+    "reading_list_egtest.mm",
+  ]
+  deps = [
+    ":eg_test_support+eg2",
+    ":reading_list_constants",
+    "//base",
+    "//base/test:test_support",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/popup_menu:constants",
+    "//ios/chrome/browser/ui/table_view:constants",
+    "//ios/chrome/test/earl_grey:eg_test_support+eg2",
+    "//ios/testing/earl_grey:eg_test_support+eg2",
+    "//ios/third_party/earl_grey2:test_lib",
+    "//ios/web/public/navigation:navigation",
+    "//net",
+    "//net:test_support",
+  ]
+  libs = [ "UIKit.framework" ]
+}
+
+source_set("test_support") {
+  defines = [ "CHROME_EARL_GREY_1" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "reading_list_app_interface.h",
+    "reading_list_app_interface.mm",
+  ]
+  deps = [
+    "//base/test:test_support",
+    "//base/test:test_support",
+    "//components/reading_list/core",
+    "//ios/chrome/browser/reading_list",
+    "//ios/chrome/test/app:test_support",
+    "//ios/testing:nserror_support",
+    "//ios/testing/earl_grey:earl_grey_support",
+  ]
+}
+
+source_set("eg_app_support+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [
+    "reading_list_app_interface.h",
+    "reading_list_app_interface.mm",
+  ]
+  deps = [
+    "//base/test:test_support",
+    "//components/reading_list/core",
+    "//ios/chrome/browser/reading_list",
+    "//ios/chrome/test/app:test_support",
+    "//ios/testing:nserror_support",
+  ]
+}
+
+source_set("eg_test_support+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [
+    "reading_list_app_interface.h",
+    "reading_list_app_interface_stub.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/testing/earl_grey:eg_test_support+eg2",
+    "//ios/third_party/earl_grey2:test_lib",
+  ]
+}

ios/chrome/browser/ui/reading_list/reading_list_app_interface.h

+// Copyright 2019 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.
+
+#ifndef IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_APP_INTERFACE_H_
+#define IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_APP_INTERFACE_H_
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#include "base/compiler_specific.h"
+
+// ReadingListAppInterface contains the app-side
+// implementation for helpers. These helpers are compiled into
+// the app binary and can be called from either app or test code.
+@interface ReadingListAppInterface : NSObject
+
+// Whether offline pages are displayed in a native content (NO) or the main
+// WKWebView (YES).
++ (BOOL)isOfflinePageWithoutNativeContentEnabled;
+
+// Removes all entries in the ReadingListModel.
++ (NSError*)clearEntries WARN_UNUSED_RESULT;
+
+// Adds an entry in the ReadingListModel.
++ (NSError*)addEntryWithURL:(NSURL*)url
+                      title:(NSString*)title
+                       read:(BOOL)read WARN_UNUSED_RESULT;
+
+// The number of read entries in the ReadingListModel.
++ (NSInteger)readEntriesCount;
+
+// The number of unread entries in the ReadingListModel.
++ (NSInteger)unreadEntriesCount;
+
+// Checks whether the current webState has a StaticHTML view contaning |text|.
+// This is only used when |isOfflinePageWithoutNativeContentEnabled| is NO.
++ (BOOL)staticHTMLViewContainingText:(NSString*)text;
+
+// Simulate that the current connection is WiFI.
++ (void)forceConnectionToWifi;
+
+// Sends a notification that connection is WiFi.
++ (void)notifyWifiConnection;
+
+// Reset the connection type.
++ (void)resetConnectionType;
+
+@end
+
+#endif  // IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_APP_INTERFACE_H_

ios/chrome/browser/ui/reading_list/reading_list_app_interface.mm

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ios/chrome/browser/ui/reading_list/reading_list_app_interface.h"
+
+#include "base/memory/singleton.h"
+#include "base/strings/sys_string_conversions.h"
+#import "base/test/ios/wait_util.h"
+#include "components/reading_list/core/reading_list_model.h"
+#include "ios/chrome/browser/reading_list/features.h"
+#include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
+#import "ios/chrome/test/app/chrome_test_util.h"
+#import "ios/chrome/test/app/static_html_view_test_util.h"
+#import "ios/chrome/test/app/tab_test_util.h"
+#import "ios/testing/nserror_util.h"
+#include "net/base/mac/url_conversions.h"
+#include "net/base/network_change_notifier.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace {
+// Returns the reading list model.
+ReadingListModel* GetReadingListModel(NSError** error) {
+  ReadingListModel* model =
+      ReadingListModelFactory::GetInstance()->GetForBrowserState(
+          chrome_test_util::GetOriginalBrowserState());
+  if (!base::test::ios::WaitUntilConditionOrTimeout(2, ^{
+        return model->loaded();
+      })) {
+    *error = testing::NSErrorWithLocalizedDescription(
+        @"Reading List model did not load");
+  }
+  return model;
+}
+
+// Overrides the NetworkChangeNotifier to enable distillation even if the device
+// does not have network.
+class WifiNetworkChangeNotifier : public net::NetworkChangeNotifier {
+ public:
+  WifiNetworkChangeNotifier() : net::NetworkChangeNotifier() {}
+
+  ConnectionType GetCurrentConnectionType() const override {
+    return CONNECTION_WIFI;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(WifiNetworkChangeNotifier);
+};
+
+// Overrides the NetworkChangeNotifier to enable distillation even if the device
+// does not have network.
+class ConnectionTypeOverrider {
+ public:
+  static ConnectionTypeOverrider* SharedInstance() {
+    return base::Singleton<ConnectionTypeOverrider>::get();
+  }
+
+  ConnectionTypeOverrider() {}
+
+  void OverrideConnectionType() {
+    network_change_disabler_.reset(
+        new net::NetworkChangeNotifier::DisableForTest());
+    wifi_network_.reset(new WifiNetworkChangeNotifier());
+  }
+
+  void ResetConnectionType() {
+    wifi_network_.reset();
+    network_change_disabler_.reset();
+  }
+
+ private:
+  std::unique_ptr<net::NetworkChangeNotifier::DisableForTest>
+      network_change_disabler_;
+  std::unique_ptr<WifiNetworkChangeNotifier> wifi_network_;
+
+  DISALLOW_COPY_AND_ASSIGN(ConnectionTypeOverrider);
+};
+
+}  // namespace
+
+@implementation ReadingListAppInterface
+
++ (NSError*)clearEntries {
+  NSError* error = nil;
+  ReadingListModel* model = GetReadingListModel(&error);
+  if (error) {
+    return error;
+  }
+  for (const GURL& url : model->Keys())
+    model->RemoveEntryByURL(url);
+  return nil;
+}
+
++ (NSError*)addEntryWithURL:(NSURL*)url title:(NSString*)title read:(BOOL)read {
+  NSError* error = nil;
+  ReadingListModel* model = GetReadingListModel(&error);
+  if (error) {
+    return error;
+  }
+  model->AddEntry(net::GURLWithNSURL(url), base::SysNSStringToUTF8(title),
+                  reading_list::ADDED_VIA_CURRENT_APP);
+  if (read) {
+    model->SetReadStatus(net::GURLWithNSURL(url), true);
+  }
+  return error;
+}
+
++ (NSInteger)readEntriesCount {
+  NSError* error = nil;
+  ReadingListModel* model = GetReadingListModel(&error);
+  if (error) {
+    return -1;
+  }
+  return model->size() - model->unread_size();
+}
+
++ (NSInteger)unreadEntriesCount {
+  NSError* error = nil;
+  ReadingListModel* model = GetReadingListModel(&error);
+  if (error) {
+    return -1;
+  }
+  return model->unread_size();
+}
+
++ (BOOL)staticHTMLViewContainingText:(NSString*)text {
+  return chrome_test_util::StaticHtmlViewContainingText(
+      chrome_test_util::GetCurrentWebState(), base::SysNSStringToUTF8(text));
+}
+
++ (BOOL)isOfflinePageWithoutNativeContentEnabled {
+  return reading_list::IsOfflinePageWithoutNativeContentEnabled();
+}
+
++ (void)forceConnectionToWifi {
+  ConnectionTypeOverrider::SharedInstance()->OverrideConnectionType();
+}
+
++ (void)notifyWifiConnection {
+  if (net::NetworkChangeNotifier::IsOffline()) {
+    net::NetworkChangeNotifier::NotifyObserversOfConnectionTypeChangeForTests(
+        net::NetworkChangeNotifier::CONNECTION_WIFI);
+  }
+}
+
++ (void)resetConnectionType {
+  ConnectionTypeOverrider::SharedInstance()->ResetConnectionType();
+}
+
+@end

ios/chrome/browser/ui/reading_list/reading_list_app_interface_stub.mm

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ios/chrome/browser/ui/reading_list/reading_list_app_interface.h"
+#import "ios/testing/earl_grey/earl_grey_test.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+#if defined(CHROME_EARL_GREY_2)
+// TODO(crbug.com/1015113): The EG2 macro is breaking indexing for some reason
+// without the trailing semicolon.  For now, disable the extra semi warning
+// so Xcode indexing works for the egtest.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat-extra-semi"
+GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(ReadingListAppInterface);
+#pragma clang diagnostic pop
+#endif  // defined(CHROME_EARL_GREY_2)

ios/chrome/browser/ui/reading_list/reading_list_toolbar_button_identifiers.h → ios/chrome/browser/ui/reading_list/reading_list_constants.h

@@ -2,11 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_TOOLBAR_BUTTON_IDENTIFIERS_H_
-#define IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_TOOLBAR_BUTTON_IDENTIFIERS_H_
+#ifndef IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_CONSTANTS_H_
+#define IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_CONSTANTS_H_
 
 #import <Foundation/Foundation.h>
 
+// Accessibility identifier for reading list view.
+extern NSString* const kReadingListViewID;
+
+// Accessibility identifier for the badge icon.
+extern NSString* const kTableViewURLCellFaviconBadgeViewID;
+
 // Accessibility identifiers for reading list toolbar buttons.
 extern NSString* const kReadingListToolbarEditButtonID;
 extern NSString* const kReadingListToolbarDeleteButtonID;
@@ -14,4 +20,4 @@ extern NSString* const kReadingListToolbarDeleteAllReadButtonID;
 extern NSString* const kReadingListToolbarCancelButtonID;
 extern NSString* const kReadingListToolbarMarkButtonID;
 
-#endif  // IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_TOOLBAR_BUTTON_IDENTIFIERS_H_
+#endif  // IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_CONSTANTS_H_

ios/chrome/browser/ui/reading_list/reading_list_toolbar_button_identifiers.mm → ios/chrome/browser/ui/reading_list/reading_list_constants.mm

@@ -2,12 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/reading_list/reading_list_toolbar_button_identifiers.h"
+#import "ios/chrome/browser/ui/reading_list/reading_list_constants.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
+NSString* const kReadingListViewID = @"ReadingListTableView";
+
+NSString* const kTableViewURLCellFaviconBadgeViewID =
+    @"TableViewURLCellFaviconBadgeView";
+
 NSString* const kReadingListToolbarEditButtonID =
     @"ReadingListToolbarEditButtonID";
 NSString* const kReadingListToolbarDeleteButtonID =

ios/chrome/browser/ui/reading_list/reading_list_egtest.mm

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <EarlGrey/EarlGrey.h>
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
@@ -16,38 +15,27 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "base/test/ios/wait_util.h"
-#include "components/reading_list/core/reading_list_model.h"
-#import "ios/chrome/browser/reading_list/features.h"
-#include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
-#include "ios/chrome/browser/system_flags.h"
-#import "ios/chrome/browser/ui/commands/reading_list_add_command.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h"
-#import "ios/chrome/browser/ui/reading_list/reading_list_table_view_controller.h"
-#import "ios/chrome/browser/ui/reading_list/reading_list_toolbar_button_identifiers.h"
-#import "ios/chrome/browser/ui/table_view/cells/table_view_url_cell_favicon_badge_view.h"
-#import "ios/chrome/browser/ui/table_view/cells/table_view_url_item.h"
-#import "ios/chrome/browser/ui/table_view/feature_flags.h"
-#import "ios/chrome/browser/ui/table_view/table_view_empty_view.h"
+#import "ios/chrome/browser/ui/reading_list/reading_list_app_interface.h"
+#import "ios/chrome/browser/ui/reading_list/reading_list_constants.h"
+#import "ios/chrome/browser/ui/table_view/table_view_constants.h"
 #include "ios/chrome/grit/ios_strings.h"
-#include "ios/chrome/grit/ios_theme_resources.h"
-#import "ios/chrome/test/app/chrome_test_util.h"
-#import "ios/chrome/test/app/static_html_view_test_util.h"
-#import "ios/chrome/test/app/tab_test_util.h"
+#import "ios/chrome/test/earl_grey/chrome_actions_app_interface.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
+#import "ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
-#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
+#import "ios/testing/earl_grey/earl_grey_test.h"
 #import "ios/web/public/navigation/navigation_manager.h"
 #import "ios/web/public/navigation/reload_type.h"
-#import "ios/web/public/test/web_view_content_test_util.h"
-#import "ios/web/public/web_state.h"
-#include "net/base/network_change_notifier.h"
 #include "net/test/embedded_test_server/default_handlers.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/test/embedded_test_server/request_handler_util.h"
 
+#include "net/base/network_change_notifier.h"
+
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
@@ -57,43 +45,29 @@ using base::test::ios::kWaitForUIElementTimeout;
 namespace {
 const char kContentToRemove[] = "Text that distillation should remove.";
 const char kContentToKeep[] = "Text that distillation should keep.";
-const char kDistillableTitle[] = "Tomato";
+NSString* const kDistillableTitle = @"Tomato";
 const char kDistillableURL[] = "/potato";
 const char kNonDistillableURL[] = "/beans";
-const char kReadTitle[] = "foobar";
-const char kReadURL[] = "http://readfoobar.com";
-const char kUnreadTitle[] = "I am an unread entry";
-const char kUnreadURL[] = "http://unreadfoobar.com";
-const char kReadURL2[] = "http://kReadURL2.com";
-const char kReadTitle2[] = "read item 2";
-const char kUnreadTitle2[] = "I am another unread entry";
-const char kUnreadURL2[] = "http://unreadfoobar2.com";
+NSString* const kReadTitle = @"foobar";
+NSString* const kReadURL = @"http://readfoobar.com";
+NSString* const kUnreadTitle = @"I am an unread entry";
+NSString* const kUnreadURL = @"http://unreadfoobar.com";
+NSString* const kReadURL2 = @"http://kReadURL2.com";
+NSString* const kReadTitle2 = @"read item 2";
+NSString* const kUnreadTitle2 = @"I am another unread entry";
+NSString* const kUnreadURL2 = @"http://unreadfoobar2.com";
 const size_t kNumberReadEntries = 2;
 const size_t kNumberUnreadEntries = 2;
 const CFTimeInterval kSnackbarAppearanceTimeout = 5;
-const CFTimeInterval kSnackbarDisappearanceTimeout =
-    MDCSnackbarMessageDurationMax + 1;
+// kSnackbarDisappearanceTimeout = MDCSnackbarMessageDurationMax + 1
+const CFTimeInterval kSnackbarDisappearanceTimeout = 10 + 1;
 const CFTimeInterval kDelayForSlowWebServer = 4;
 const CFTimeInterval kLoadOfflineTimeout = kDelayForSlowWebServer + 1;
 const CFTimeInterval kLongPressDuration = 1.0;
 const CFTimeInterval kDistillationTimeout = 5;
 const CFTimeInterval kServerOperationDelay = 1;
-const char kReadHeader[] = "Read";
-const char kUnreadHeader[] = "Unread";
-
-// Overrides the NetworkChangeNotifier to enable distillation even if the device
-// does not have network.
-class WifiNetworkChangeNotifier : public net::NetworkChangeNotifier {
- public:
-  WifiNetworkChangeNotifier() : net::NetworkChangeNotifier() {}
-
-  ConnectionType GetCurrentConnectionType() const override {
-    return CONNECTION_WIFI;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(WifiNetworkChangeNotifier);
-};
+NSString* const kReadHeader = @"Read";
+NSString* const kUnreadHeader = @"Unread";
 
 // Returns the string concatenated |n| times.
 std::string operator*(const std::string& s, unsigned int n) {
@@ -103,37 +77,10 @@ std::string operator*(const std::string& s, unsigned int n) {
   return out.str();
 }
 
-// Returns the reading list model.
-ReadingListModel* GetReadingListModel() {
-  ReadingListModel* model =
-      ReadingListModelFactory::GetInstance()->GetForBrowserState(
-          chrome_test_util::GetOriginalBrowserState());
-  GREYAssert(
-      base::test::ios::WaitUntilConditionOrTimeout(2,
-                                                   ^{
-                                                     return model->loaded();
-                                                   }),
-      @"Reading List model did not load");
-  return model;
-}
-
 // Scroll to the top of the Reading List.
 void ScrollToTop() {
-  // On iOS 13 the settings menu appears as a card that can be dismissed with a
-  // downward swipe, for this reason we need to swipe up programatically to
-  // avoid dismissing the VC.
-  GREYPerformBlock scrollToTopBlock =
-      ^BOOL(id element, __strong NSError** error) {
-        UIScrollView* view = base::mac::ObjCCastStrict<UIScrollView>(element);
-        view.contentOffset = CGPointZero;
-        return YES;
-      };
-
-  [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
-                                          [[ReadingListTableViewController
-                                              class] accessibilityIdentifier])]
-      performAction:[GREYActionBlock actionWithName:@"Scroll to top"
-                                       performBlock:scrollToTopBlock]];
+  [[EarlGrey selectElementWithMatcher:grey_accessibilityID(kReadingListViewID)]
+      performAction:[ChromeActionsAppInterface scrollToTop]];
 }
 
 // Asserts that the "mark" toolbar button is visible and has the a11y label of
@@ -143,7 +90,7 @@ void AssertToolbarMarkButtonText(int a11y_label_id) {
       selectElementWithMatcher:
           grey_allOf(
               grey_accessibilityID(kReadingListToolbarMarkButtonID),
-              grey_ancestor(grey_kindOfClass([UIToolbar class])),
+              grey_ancestor(grey_kindOfClassName(@"UIToolbar")),
               chrome_test_util::ButtonWithAccessibilityLabelId(a11y_label_id),
               nil)] assertWithMatcher:grey_sufficientlyVisible()];
 }
@@ -152,8 +99,8 @@ void AssertToolbarMarkButtonText(int a11y_label_id) {
 void AssertToolbarButtonNotVisibleWithID(NSString* button_id) {
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(grey_accessibilityID(button_id),
-                                          grey_ancestor(grey_kindOfClass(
-                                              [UIToolbar class])),
+                                          grey_ancestor(grey_kindOfClassName(
+                                              @"UIToolbar")),
                                           nil)]
       assertWithMatcher:grey_notVisible()];
 }
@@ -162,8 +109,8 @@ void AssertToolbarButtonNotVisibleWithID(NSString* button_id) {
 void AssertToolbarButtonVisibleWithID(NSString* button_id) {
   [[EarlGrey
       selectElementWithMatcher:grey_allOf(grey_accessibilityID(button_id),
-                                          grey_ancestor(grey_kindOfClass(
-                                              [UIToolbar class])),
+                                          grey_ancestor(grey_kindOfClassName(
+                                              @"UIToolbar")),
                                           nil)]
       assertWithMatcher:grey_sufficientlyVisible()];
 }
@@ -183,45 +130,40 @@ void TapContextMenuButtonWithA11yLabelID(int a11y_label_id) {
 
 // Performs |action| on the entry with the title |entryTitle|. The view can be
 // scrolled down to find the entry.
-void PerformActionOnEntry(const std::string& entryTitle,
-                          id<GREYAction> action) {
+void PerformActionOnEntry(NSString* entryTitle, id<GREYAction> action) {
   ScrollToTop();
   id<GREYMatcher> matcher =
-      grey_allOf(chrome_test_util::StaticTextWithAccessibilityLabel(
-                     base::SysUTF8ToNSString(entryTitle)),
-                 grey_ancestor(grey_kindOfClass([TableViewURLCell class])),
+      grey_allOf(chrome_test_util::StaticTextWithAccessibilityLabel(entryTitle),
+                 grey_ancestor(grey_kindOfClassName(@"TableViewURLCell")),
                  grey_sufficientlyVisible(), nil);
   [[[EarlGrey selectElementWithMatcher:matcher]
          usingSearchAction:grey_scrollInDirection(kGREYDirectionDown, 100)
-      onElementWithMatcher:grey_accessibilityID([[ReadingListTableViewController
-                               class] accessibilityIdentifier])]
+      onElementWithMatcher:grey_accessibilityID(kReadingListViewID)]
       performAction:action];
 }
 
 // Taps the entry with the title |entryTitle|.
-void TapEntry(const std::string& entryTitle) {
+void TapEntry(NSString* entryTitle) {
   PerformActionOnEntry(entryTitle, grey_tap());
 }
 
 // Long-presses the entry with the title |entryTitle|.
-void LongPressEntry(const std::string& entryTitle) {
+void LongPressEntry(NSString* entryTitle) {
   PerformActionOnEntry(entryTitle,
                        grey_longPressWithDuration(kLongPressDuration));
 }
 
 // Asserts that the entry with the title |entryTitle| is visible.
-void AssertEntryVisible(const std::string& entryTitle) {
+void AssertEntryVisible(NSString* entryTitle) {
   ScrollToTop();
   [[[EarlGrey
       selectElementWithMatcher:
-          grey_allOf(chrome_test_util::StaticTextWithAccessibilityLabel(
-                         base::SysUTF8ToNSString(entryTitle)),
-                     grey_ancestor(grey_kindOfClass([TableViewURLCell class])),
-                     grey_sufficientlyVisible(), nil)]
+          grey_allOf(
+              chrome_test_util::StaticTextWithAccessibilityLabel(entryTitle),
+              grey_ancestor(grey_kindOfClassName(@"TableViewURLCell")),
+              grey_sufficientlyVisible(), nil)]
          usingSearchAction:grey_scrollInDirection(kGREYDirectionDown, 100)
-      onElementWithMatcher:grey_accessibilityID(
-                               [[ReadingListTableViewController class]
-                                   accessibilityIdentifier])]
+      onElementWithMatcher:grey_accessibilityID(kReadingListViewID)]
       assertWithMatcher:grey_notNil()];
 }
 
@@ -240,57 +182,59 @@ void AssertAllEntriesVisible() {
 }
 
 // Asserts that the entry |title| is not visible.
-void AssertEntryNotVisible(std::string title) {
+void AssertEntryNotVisible(NSString* title) {
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
   ScrollToTop();
   NSError* error;
 
   [[[EarlGrey
       selectElementWithMatcher:
-          grey_allOf(chrome_test_util::StaticTextWithAccessibilityLabel(
-                         base::SysUTF8ToNSString(title)),
-                     grey_ancestor(grey_kindOfClass([TableViewURLCell class])),
+          grey_allOf(chrome_test_util::StaticTextWithAccessibilityLabel(title),
+                     grey_ancestor(grey_kindOfClassName(@"TableViewURLCell")),
                      grey_sufficientlyVisible(), nil)]
          usingSearchAction:grey_scrollInDirection(kGREYDirectionDown, 100)
-      onElementWithMatcher:grey_accessibilityID(
-                               [[ReadingListTableViewController class]
-                                   accessibilityIdentifier])]
+      onElementWithMatcher:grey_accessibilityID(kReadingListViewID)]
       assertWithMatcher:grey_notNil()
                   error:&error];
   GREYAssertNotNil(error, @"Entry is visible");
 }
 
 // Asserts |header| is visible.
-void AssertHeaderNotVisible(std::string header) {
+void AssertHeaderNotVisible(NSString* header) {
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
   ScrollToTop();
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::
-                                          StaticTextWithAccessibilityLabel(
-                                              base::SysUTF8ToNSString(header))]
+  [[EarlGrey selectElementWithMatcher:
+                 chrome_test_util::StaticTextWithAccessibilityLabel(header)]
       assertWithMatcher:grey_notVisible()];
 }
 
-// Opens the reading list menu using command line.
+// Opens the reading list menu.
 void OpenReadingList() {
-  [chrome_test_util::BrowserCommandDispatcherForMainBVC() showReadingList];
+  [ChromeEarlGreyUI openToolsMenu];
+  [ChromeEarlGreyUI
+      tapToolsMenuButton:chrome_test_util::ReadingListMenuButton()];
 }
 
 // Adds 20 read and 20 unread entries to the model, opens the reading list menu
 // and enter edit mode.
 void AddLotOfEntriesAndEnterEdit() {
-  ReadingListModel* model = GetReadingListModel();
   for (NSInteger index = 0; index < 10; index++) {
-    GURL url_to_be_added =
-        GURL(kReadURL + std::string("/") + base::NumberToString(index));
-    model->AddEntry(url_to_be_added, std::string(kReadTitle),
-                    reading_list::ADDED_VIA_CURRENT_APP);
-    model->SetReadStatus(url_to_be_added, true);
+    NSString* url_to_be_added =
+        [kReadURL stringByAppendingPathComponent:[@(index) stringValue]];
+    GREYAssertNil([ReadingListAppInterface
+                      addEntryWithURL:[NSURL URLWithString:url_to_be_added]
+                                title:kReadTitle
+                                 read:YES],
+                  @"Unable to add Reading List item");
   }
   for (NSInteger index = 0; index < 10; index++) {
-    GURL url_to_be_added =
-        GURL(kUnreadURL + std::string("/") + base::NumberToString(index));
-    model->AddEntry(url_to_be_added, std::string(kReadTitle),
-                    reading_list::ADDED_VIA_CURRENT_APP);
+    NSString* url_to_be_added =
+        [kUnreadURL stringByAppendingPathComponent:[@(index) stringValue]];
+    GREYAssertNil([ReadingListAppInterface
+                      addEntryWithURL:[NSURL URLWithString:url_to_be_added]
+                                title:kReadTitle
+                                 read:NO],
+                  @"Unable to add Reading List item");
   }
   OpenReadingList();
 
@@ -300,37 +244,35 @@ void AddLotOfEntriesAndEnterEdit() {
 // Adds a read and an unread entry to the model, opens the reading list menu and
 // enter edit mode.
 void AddEntriesAndEnterEdit() {
-  ReadingListModel* model = GetReadingListModel();
-  model->AddEntry(GURL(kReadURL), std::string(kReadTitle),
-                  reading_list::ADDED_VIA_CURRENT_APP);
-  model->SetReadStatus(GURL(kReadURL), true);
-  model->AddEntry(GURL(kReadURL2), std::string(kReadTitle2),
-                  reading_list::ADDED_VIA_CURRENT_APP);
-  model->SetReadStatus(GURL(kReadURL2), true);
-  model->AddEntry(GURL(kUnreadURL), std::string(kUnreadTitle),
-                  reading_list::ADDED_VIA_CURRENT_APP);
-  model->AddEntry(GURL(kUnreadURL2), std::string(kUnreadTitle2),
-                  reading_list::ADDED_VIA_CURRENT_APP);
+  GREYAssertNil(
+      [ReadingListAppInterface addEntryWithURL:[NSURL URLWithString:kReadURL]
+                                         title:kReadTitle
+                                          read:YES],
+      @"Unable to add Reading List item");
+  GREYAssertNil(
+      [ReadingListAppInterface addEntryWithURL:[NSURL URLWithString:kReadURL2]
+                                         title:kReadTitle2
+                                          read:YES],
+      @"Unable to add Reading List item");
+  GREYAssertNil(
+      [ReadingListAppInterface addEntryWithURL:[NSURL URLWithString:kUnreadURL]
+                                         title:kUnreadTitle
+                                          read:NO],
+      @"Unable to add Reading List item");
+  GREYAssertNil(
+      [ReadingListAppInterface addEntryWithURL:[NSURL URLWithString:kUnreadURL2]
+                                         title:kUnreadTitle2
+                                          read:NO],
+      @"Unable to add Reading List item");
+
   OpenReadingList();
 
   TapToolbarButtonWithID(kReadingListToolbarEditButtonID);
 }
 
-// Computes the number of read entries in the model.
-size_t ModelReadSize(ReadingListModel* model) {
-  size_t size = 0;
-  for (const auto& url : model->Keys()) {
-    if (model->GetEntryByURL(url)->IsRead()) {
-      size++;
-    }
-  }
-  return size;
-}
-
 // Returns a match for the Reading List Empty Collection Background.
 id<GREYMatcher> EmptyBackground() {
-  return grey_accessibilityID(
-      [[TableViewEmptyView class] accessibilityIdentifier]);
+  return grey_accessibilityID(kTableViewEmptyViewID);
 }
 
 // Adds the current page to the Reading List.
@@ -367,20 +309,17 @@ void AddCurrentPageToReadingList() {
   GREYAssert(base::test::ios::WaitUntilConditionOrTimeout(
                  kSnackbarDisappearanceTimeout, wait_for_disappearance),
              @"Snackbar did not disappear.");
-  if (net::NetworkChangeNotifier::IsOffline()) {
-    net::NetworkChangeNotifier::NotifyObserversOfConnectionTypeChangeForTests(
-        net::NetworkChangeNotifier::CONNECTION_WIFI);
-  }
+  [ReadingListAppInterface notifyWifiConnection];
 }
 
 // Wait until one element is distilled.
 void WaitForDistillation() {
-  NSString* a11y_id =
-      [TableViewURLCellFaviconBadgeView accessibilityIdentifier];
   ConditionBlock wait_for_distillation_date = ^{
     NSError* error = nil;
-    [[EarlGrey selectElementWithMatcher:grey_accessibilityID(a11y_id)]
-        assertWithMatcher:grey_notNil()
+    [[EarlGrey
+        selectElementWithMatcher:grey_accessibilityID(
+                                     kTableViewURLCellFaviconBadgeViewID)]
+        assertWithMatcher:grey_sufficientlyVisible()
                     error:&error];
     return error == nil;
   };
@@ -434,9 +373,7 @@ void OpenPageSecurityInfoBubble() {
 void WaitForStaticHtmlViewContainingText(NSString* text) {
   bool has_static_view =
       base::test::ios::WaitUntilConditionOrTimeout(kWaitForUIElementTimeout, ^{
-        return chrome_test_util::StaticHtmlViewContainingText(
-            chrome_test_util::GetCurrentWebState(),
-            base::SysNSStringToUTF8(text));
+        return [ReadingListAppInterface staticHTMLViewContainingText:text];
       });
 
   NSString* error_description = [NSString
@@ -450,9 +387,7 @@ void WaitForStaticHtmlViewContainingText(NSString* text) {
 void WaitForStaticHtmlViewNotContainingText(NSString* text) {
   bool no_static_view =
       base::test::ios::WaitUntilConditionOrTimeout(kWaitForUIElementTimeout, ^{
-        return !chrome_test_util::StaticHtmlViewContainingText(
-            chrome_test_util::GetCurrentWebState(),
-            base::SysNSStringToUTF8(text));
+        return ![ReadingListAppInterface staticHTMLViewContainingText:text];
       });
 
   NSString* error_description = [NSString
@@ -499,9 +434,8 @@ void AssertIsShowingDistillablePageNativeContent(bool online,
     GREYAssert(base::test::ios::WaitUntilConditionOrTimeout(
                    kLoadOfflineTimeout,
                    ^bool {
-                     return web::test::IsWebViewContainingText(
-                         chrome_test_util::GetCurrentWebState(),
-                         kContentToKeep);
+                     return [ChromeEarlGreyAppInterface
+                         webStateContainsText:@(kContentToKeep)];
                    }),
                @"Waiting for online page.");
   } else {
@@ -533,7 +467,7 @@ void AssertIsShowingDistillablePageNativeContent(bool online,
 
 // Tests that the correct version of kDistillableURL is displayed.
 void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
-  if (reading_list::IsOfflinePageWithoutNativeContentEnabled()) {
+  if ([ReadingListAppInterface isOfflinePageWithoutNativeContentEnabled]) {
     return AssertIsShowingDistillablePageNoNativeContent(online,
                                                          distillable_url);
   }
@@ -550,7 +484,6 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 
 // The delay after which self.testServer will send a response.
 @property(atomic) NSTimeInterval serverResponseDelay;
-;
 @end
 
 @implementation ReadingListTestCase
@@ -559,9 +492,8 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 
 - (void)setUp {
   [super setUp];
-  ReadingListModel* model = GetReadingListModel();
-  for (const GURL& url : model->Keys())
-    model->RemoveEntryByURL(url);
+  GREYAssertNil([ReadingListAppInterface clearEntries],
+                @"Unable to clear Reading List entries");
   self.testServer->RegisterRequestHandler(base::BindRepeating(
       &net::test_server::HandlePrefixedRequest, kDistillableURL,
       base::BindRepeating(&HandleQueryOrCloseSocket,
@@ -576,6 +508,11 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   GREYAssertTrue(self.testServer->Start(), @"Test server failed to start.");
 }
 
+- (void)tearDown {
+  [super tearDown];
+  [ReadingListAppInterface resetConnectionType];
+}
+
 // Tests that the Reading List view is accessible.
 - (void)testAccessibility {
   AddEntriesAndEnterEdit();
@@ -589,14 +526,12 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 // appearing, and that the Reading List entry is present in the Reading List.
 // Loads offline version via context menu.
 - (void)testSavingToReadingListAndLoadDistilled {
-  auto network_change_disabler =
-      std::make_unique<net::NetworkChangeNotifier::DisableForTest>();
-  auto wifi_network = std::make_unique<WifiNetworkChangeNotifier>();
+  [ReadingListAppInterface forceConnectionToWifi];
   GURL distillablePageURL(self.testServer->GetURL(kDistillableURL));
   GURL nonDistillablePageURL(self.testServer->GetURL(kNonDistillableURL));
-  std::string pageTitle(kDistillableTitle);
   // Open http://potato
   [ChromeEarlGrey loadURL:distillablePageURL];
+  [ChromeEarlGrey waitForPageToFinishLoading];
 
   AddCurrentPageToReadingList();
 
@@ -606,14 +541,17 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 
   // Verify that an entry with the correct title is present in the reading list.
   OpenReadingList();
-  AssertEntryVisible(pageTitle);
+  AssertEntryVisible(kDistillableTitle);
 
   WaitForDistillation();
 
   // Long press the entry, and open it offline.
-  LongPressEntry(pageTitle);
+  LongPressEntry(kDistillableTitle);
+
   TapContextMenuButtonWithA11yLabelID(
       IDS_IOS_READING_LIST_CONTENT_CONTEXT_OFFLINE);
+  [ChromeEarlGrey waitForPageToFinishLoading];
+  base::test::ios::SpinRunLoopWithMinDelay(base::TimeDelta::FromSecondsD(1));
   AssertIsShowingDistillablePage(false, distillablePageURL);
 
   // Tap the Omnibox' Info Bubble to open the Page Info.
@@ -626,18 +564,15 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
       assertWithMatcher:grey_notNil()];
 
   // Verify that the webState's title is correct.
-  XCTAssertTrue(chrome_test_util::GetCurrentWebState()->GetTitle() ==
-                base::ASCIIToUTF16(pageTitle.c_str()));
+  GREYAssertEqualObjects([ChromeEarlGreyAppInterface currentTabTitle],
+                         kDistillableTitle, @"Wrong page name");
 }
 
 // Tests that sharing a web page to the Reading List results in a snackbar
 // appearing, and that the Reading List entry is present in the Reading List.
 // Loads online version by tapping on entry.
 - (void)testSavingToReadingListAndLoadNormal {
-  auto network_change_disabler =
-      std::make_unique<net::NetworkChangeNotifier::DisableForTest>();
-  auto wifi_network = std::make_unique<WifiNetworkChangeNotifier>();
-  std::string pageTitle(kDistillableTitle);
+  [ReadingListAppInterface forceConnectionToWifi];
   GURL distillableURL = self.testServer->GetURL(kDistillableURL);
   // Open http://potato
   [ChromeEarlGrey loadURL:distillableURL];
@@ -650,11 +585,11 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 
   // Verify that an entry with the correct title is present in the reading list.
   OpenReadingList();
-  AssertEntryVisible(pageTitle);
+  AssertEntryVisible(kDistillableTitle);
   WaitForDistillation();
 
   // Press the entry, and open it online.
-  TapEntry(pageTitle);
+  TapEntry(kDistillableTitle);
 
   AssertIsShowingDistillablePage(true, distillableURL);
   // Stop server to reload offline.
@@ -662,8 +597,7 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   base::test::ios::SpinRunLoopWithMinDelay(
       base::TimeDelta::FromSecondsD(kServerOperationDelay));
 
-  chrome_test_util::GetCurrentWebState()->GetNavigationManager()->Reload(
-      web::ReloadType::NORMAL, false);
+  [ChromeEarlGreyAppInterface startReloading];
   AssertIsShowingDistillablePage(false, distillableURL);
 }
 
@@ -671,10 +605,7 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 // appearing, and that the Reading List entry is present in the Reading List.
 // Loads offline version by tapping on entry without web server.
 - (void)testSavingToReadingListAndLoadNoNetwork {
-  auto network_change_disabler =
-      std::make_unique<net::NetworkChangeNotifier::DisableForTest>();
-  auto wifi_network = std::make_unique<WifiNetworkChangeNotifier>();
-  std::string pageTitle(kDistillableTitle);
+  [ReadingListAppInterface forceConnectionToWifi];
   GURL distillableURL = self.testServer->GetURL(kDistillableURL);
   // Open http://potato
   [ChromeEarlGrey loadURL:distillableURL];
@@ -688,7 +619,7 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 
   // Verify that an entry with the correct title is present in the reading list.
   OpenReadingList();
-  AssertEntryVisible(pageTitle);
+  AssertEntryVisible(kDistillableTitle);
   WaitForDistillation();
 
   // Stop server to generate error.
@@ -696,12 +627,11 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   base::test::ios::SpinRunLoopWithMinDelay(
       base::TimeDelta::FromSecondsD(kServerOperationDelay));
   // Long press the entry, and open it offline.
-  TapEntry(pageTitle);
+  TapEntry(kDistillableTitle);
   AssertIsShowingDistillablePage(false, distillableURL);
 
   // Reload. As server is still down, the offline page should show again.
-  chrome_test_util::GetCurrentWebState()->GetNavigationManager()->Reload(
-      web::ReloadType::NORMAL, false);
+  [ChromeEarlGreyAppInterface startReloading];
   AssertIsShowingDistillablePage(false, distillableURL);
 
   // TODO(crbug.com/954248) This DCHECK's (but works) with slimnav disabled.
@@ -716,8 +646,7 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   base::test::ios::SpinRunLoopWithMinDelay(
       base::TimeDelta::FromSecondsD(kServerOperationDelay));
 
-  chrome_test_util::GetCurrentWebState()->GetNavigationManager()->Reload(
-      web::ReloadType::NORMAL, false);
+  [ChromeEarlGreyAppInterface startReloading];
   AssertIsShowingDistillablePage(true, distillableURL);
 }
 
@@ -725,10 +654,7 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 // appearing, and that the Reading List entry is present in the Reading List.
 // Loads offline version by tapping on entry with delayed web server.
 - (void)testSavingToReadingListAndLoadBadNetwork {
-  auto network_change_disabler =
-      std::make_unique<net::NetworkChangeNotifier::DisableForTest>();
-  auto wifi_network = std::make_unique<WifiNetworkChangeNotifier>();
-  std::string pageTitle(kDistillableTitle);
+  [ReadingListAppInterface forceConnectionToWifi];
   GURL distillableURL = self.testServer->GetURL(kDistillableURL);
   // Open http://potato
   [ChromeEarlGrey loadURL:distillableURL];
@@ -741,33 +667,35 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 
   // Verify that an entry with the correct title is present in the reading
   OpenReadingList();
-  AssertEntryVisible(pageTitle);
+  AssertEntryVisible(kDistillableTitle);
   WaitForDistillation();
 
   self.serverResponseDelay = kDelayForSlowWebServer;
   // Open the entry.
-  TapEntry(pageTitle);
+  TapEntry(kDistillableTitle);
 
   AssertIsShowingDistillablePage(false, distillableURL);
 
   [ChromeEarlGrey goBack];
   [ChromeEarlGrey goForward];
+  base::test::ios::SpinRunLoopWithMinDelay(base::TimeDelta::FromSecondsD(1));
   AssertIsShowingDistillablePage(false, distillableURL);
 
   // Reload should load online page.
-  chrome_test_util::GetCurrentWebState()->GetNavigationManager()->Reload(
-      web::ReloadType::NORMAL, false);
+  [ChromeEarlGreyAppInterface startReloading];
   AssertIsShowingDistillablePage(true, distillableURL);
   // Reload should load offline page.
-  chrome_test_util::GetCurrentWebState()->GetNavigationManager()->Reload(
-      web::ReloadType::NORMAL, false);
+  [ChromeEarlGreyAppInterface startReloading];
   AssertIsShowingDistillablePage(false, distillableURL);
 }
 
 // Tests that only the "Edit" button is showing when not editing.
 - (void)testVisibleButtonsNonEditingMode {
-  GetReadingListModel()->AddEntry(GURL(kUnreadURL), std::string(kUnreadTitle),
-                                  reading_list::ADDED_VIA_CURRENT_APP);
+  GREYAssertNil(
+      [ReadingListAppInterface addEntryWithURL:[NSURL URLWithString:kUnreadURL]
+                                         title:kUnreadTitle
+                                          read:NO],
+      @"Unable to add Reading List entry.");
   OpenReadingList();
 
   AssertToolbarButtonNotVisibleWithID(kReadingListToolbarDeleteButtonID);
@@ -840,8 +768,10 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   AssertEntryNotVisible(kReadTitle2);
   AssertEntryVisible(kUnreadTitle);
   AssertEntryVisible(kUnreadTitle2);
-  XCTAssertEqual(kNumberReadEntries - 1, ModelReadSize(GetReadingListModel()));
-  XCTAssertEqual(kNumberUnreadEntries, GetReadingListModel()->unread_size());
+  XCTAssertEqual([ReadingListAppInterface readEntriesCount],
+                 static_cast<long>(kNumberReadEntries - 1));
+  XCTAssertEqual([ReadingListAppInterface unreadEntriesCount],
+                 kNumberUnreadEntries);
 }
 
 // Tests the deletion of all read entries.
@@ -855,8 +785,9 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   AssertHeaderNotVisible(kReadHeader);
   AssertEntryVisible(kUnreadTitle);
   AssertEntryVisible(kUnreadTitle2);
-  XCTAssertEqual((size_t)0, ModelReadSize(GetReadingListModel()));
-  XCTAssertEqual(kNumberUnreadEntries, GetReadingListModel()->unread_size());
+  XCTAssertEqual(0l, [ReadingListAppInterface readEntriesCount]);
+  XCTAssertEqual(kNumberUnreadEntries,
+                 [ReadingListAppInterface unreadEntriesCount]);
 }
 
 // Marks all unread entries as read.
@@ -872,9 +803,9 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 
   AssertHeaderNotVisible(kUnreadHeader);
   AssertAllEntriesVisible();
-  XCTAssertEqual(kNumberUnreadEntries + kNumberReadEntries,
-                 ModelReadSize(GetReadingListModel()));
-  XCTAssertEqual((size_t)0, GetReadingListModel()->unread_size());
+  XCTAssertEqual(static_cast<long>(kNumberUnreadEntries + kNumberReadEntries),
+                 [ReadingListAppInterface readEntriesCount]);
+  XCTAssertEqual(0l, [ReadingListAppInterface unreadEntriesCount]);
 }
 
 // Marks all read entries as unread.
@@ -890,9 +821,9 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
 
   AssertHeaderNotVisible(kReadHeader);
   AssertAllEntriesVisible();
-  XCTAssertEqual(kNumberUnreadEntries + kNumberReadEntries,
-                 GetReadingListModel()->unread_size());
-  XCTAssertEqual((size_t)0, ModelReadSize(GetReadingListModel()));
+  XCTAssertEqual(static_cast<long>(kNumberUnreadEntries + kNumberReadEntries),
+                 [ReadingListAppInterface unreadEntriesCount]);
+  XCTAssertEqual(0l, [ReadingListAppInterface readEntriesCount]);
 }
 
 // Marks all read entries as unread, when there is a lot of entries. This is to
@@ -919,9 +850,10 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   TapToolbarButtonWithID(kReadingListToolbarMarkButtonID);
 
   AssertAllEntriesVisible();
-  XCTAssertEqual(kNumberReadEntries + 1, ModelReadSize(GetReadingListModel()));
-  XCTAssertEqual(kNumberUnreadEntries - 1,
-                 GetReadingListModel()->unread_size());
+  XCTAssertEqual(static_cast<long>(kNumberReadEntries + 1),
+                 [ReadingListAppInterface readEntriesCount]);
+  XCTAssertEqual(static_cast<long>(kNumberUnreadEntries - 1),
+                 [ReadingListAppInterface unreadEntriesCount]);
 }
 
 // Selects an read entry and mark it as unread.
@@ -933,9 +865,10 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   TapToolbarButtonWithID(kReadingListToolbarMarkButtonID);
 
   AssertAllEntriesVisible();
-  XCTAssertEqual(kNumberReadEntries - 1, ModelReadSize(GetReadingListModel()));
-  XCTAssertEqual(kNumberUnreadEntries + 1,
-                 GetReadingListModel()->unread_size());
+  XCTAssertEqual(static_cast<long>(kNumberReadEntries - 1),
+                 [ReadingListAppInterface readEntriesCount]);
+  XCTAssertEqual(static_cast<long>(kNumberUnreadEntries + 1),
+                 [ReadingListAppInterface unreadEntriesCount]);
 }
 
 // Selects read and unread entries and mark them as unread.
@@ -951,9 +884,10 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   TapContextMenuButtonWithA11yLabelID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON);
 
   AssertAllEntriesVisible();
-  XCTAssertEqual(kNumberReadEntries - 1, ModelReadSize(GetReadingListModel()));
-  XCTAssertEqual(kNumberUnreadEntries + 1,
-                 GetReadingListModel()->unread_size());
+  XCTAssertEqual(static_cast<long>(kNumberReadEntries - 1),
+                 [ReadingListAppInterface readEntriesCount]);
+  XCTAssertEqual(static_cast<long>(kNumberUnreadEntries + 1),
+                 [ReadingListAppInterface unreadEntriesCount]);
 }
 
 // Selects read and unread entries and mark them as read.
@@ -969,22 +903,24 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   TapContextMenuButtonWithA11yLabelID(IDS_IOS_READING_LIST_MARK_READ_BUTTON);
 
   AssertAllEntriesVisible();
-  XCTAssertEqual(kNumberReadEntries + 1, ModelReadSize(GetReadingListModel()));
-  XCTAssertEqual(kNumberUnreadEntries - 1,
-                 GetReadingListModel()->unread_size());
+  XCTAssertEqual(static_cast<long>(kNumberReadEntries + 1),
+                 [ReadingListAppInterface readEntriesCount]);
+  XCTAssertEqual(static_cast<long>(kNumberUnreadEntries - 1),
+                 [ReadingListAppInterface unreadEntriesCount]);
 }
 
 // Tests that you can delete multiple read items in the Reading List without
 // creating a crash (crbug.com/701956).
 - (void)testDeleteMultipleItems {
   // Add entries.
-  ReadingListModel* model = GetReadingListModel();
   for (int i = 0; i < 11; i++) {
-    std::string increment = std::to_string(i);
-    model->AddEntry(GURL(kReadURL + increment),
-                    std::string(kReadTitle + increment),
-                    reading_list::ADDED_VIA_CURRENT_APP);
-    model->SetReadStatus(GURL(kReadURL + increment), true);
+    NSURL* url =
+        [NSURL URLWithString:[kReadURL stringByAppendingFormat:@"%d", i]];
+    NSString* title = [kReadURL stringByAppendingFormat:@"%d", i];
+    GREYAssertNil([ReadingListAppInterface addEntryWithURL:url
+                                                     title:title
+                                                      read:YES],
+                  @"Unable to add Reading List entry.");
   }
 
   // Delete them from the Reading List view.
@@ -1004,30 +940,27 @@ void AssertIsShowingDistillablePage(bool online, const GURL& distillable_url) {
   if (!base::ios::IsRunningOnOrLater(13, 0, 0)) {
     EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 12 and lower.");
   }
-  if (!IsCollectionsCardPresentationStyleEnabled()) {
+  if (![ChromeEarlGreyAppInterface isCollectionsCardPresentationStyleEnabled]) {
     EARL_GREY_TEST_SKIPPED(@"Test disabled on when feature flag is off.");
   }
 
-  GetReadingListModel()->AddEntry(GURL(kUnreadURL), std::string(kUnreadTitle),
-                                  reading_list::ADDED_VIA_CURRENT_APP);
+  GREYAssertNil(
+      [ReadingListAppInterface addEntryWithURL:[NSURL URLWithString:kUnreadURL]
+                                         title:kUnreadTitle
+                                          read:NO],
+      @"Unable to add Reading List entry.");
   OpenReadingList();
 
   // Check that the TableView is presented.
-  [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
-                                          [[ReadingListTableViewController
-                                              class] accessibilityIdentifier])]
+  [[EarlGrey selectElementWithMatcher:grey_accessibilityID(kReadingListViewID)]
       assertWithMatcher:grey_notNil()];
 
   // Swipe TableView down.
-  [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
-                                          [[ReadingListTableViewController
-                                              class] accessibilityIdentifier])]
+  [[EarlGrey selectElementWithMatcher:grey_accessibilityID(kReadingListViewID)]
       performAction:grey_swipeFastInDirection(kGREYDirectionDown)];
 
   // Check that the TableView has been dismissed.
-  [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
-                                          [[ReadingListTableViewController
-                                              class] accessibilityIdentifier])]
+  [[EarlGrey selectElementWithMatcher:grey_accessibilityID(kReadingListViewID)]
       assertWithMatcher:grey_nil()];
 }
 

ios/chrome/browser/ui/reading_list/reading_list_table_view_controller.mm

@@ -15,6 +15,7 @@
 #import "ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator.h"
 #import "ios/chrome/browser/ui/list_model/list_item+Controller.h"
 #import "ios/chrome/browser/ui/reading_list/empty_reading_list_message_util.h"
+#import "ios/chrome/browser/ui/reading_list/reading_list_constants.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_data_sink.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_data_source.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_list_item_updater.h"
@@ -189,7 +190,7 @@ ReadingListSelectionState GetSelectionStateForSelectedCounts(
 }
 
 + (NSString*)accessibilityIdentifier {
-  return @"ReadingListTableView";
+  return kReadingListViewID;
 }
 
 #pragma mark - UIViewController

ios/chrome/browser/ui/reading_list/reading_list_toolbar_button_manager.mm

@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #import "ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator.h"
+#import "ios/chrome/browser/ui/reading_list/reading_list_constants.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_toolbar_button_commands.h"
-#import "ios/chrome/browser/ui/reading_list/reading_list_toolbar_button_identifiers.h"
 #import "ios/chrome/common/colors/semantic_color_names.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"

ios/chrome/browser/ui/table_view/BUILD.gn

@@ -34,6 +34,8 @@ source_set("table_view") {
 source_set("constants") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "table_view_constants.h",
+    "table_view_constants.mm",
     "table_view_navigation_controller_constants.h",
     "table_view_navigation_controller_constants.mm",
   ]
@@ -78,6 +80,7 @@ source_set("views") {
     "table_view_loading_view.mm",
   ]
   deps = [
+    ":constants",
     "//base",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/material_components",

ios/chrome/browser/ui/table_view/cells/BUILD.gn

@@ -54,6 +54,7 @@ source_set("cells") {
     "//ios/chrome/browser/ui/colors:colors",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/list_model",
+    "//ios/chrome/browser/ui/reading_list:reading_list_constants",
     "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/util",

ios/chrome/browser/ui/table_view/cells/table_view_url_cell_favicon_badge_view.mm

@@ -4,6 +4,8 @@
 
 #import "ios/chrome/browser/ui/table_view/cells/table_view_url_cell_favicon_badge_view.h"
 
+#import "ios/chrome/browser/ui/reading_list/reading_list_constants.h"
+
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
@@ -21,7 +23,7 @@
 #pragma mark - Public
 
 + (NSString*)accessibilityIdentifier {
-  return @"TableViewURLCellFaviconBadgeView";
+  return kTableViewURLCellFaviconBadgeViewID;
 }
 
 #pragma mark - UIImageView

ios/chrome/browser/ui/table_view/table_view_constants.h

+// Copyright 2019 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.
+
+#ifndef IOS_CHROME_BROWSER_UI_TABLE_VIEW_TABLE_VIEW_CONSTANTS_H_
+#define IOS_CHROME_BROWSER_UI_TABLE_VIEW_TABLE_VIEW_CONSTANTS_H_
+
+#import <Foundation/Foundation.h>
+
+extern NSString* const kTableViewEmptyViewID;
+
+#endif  // IOS_CHROME_BROWSER_UI_TABLE_VIEW_TABLE_VIEW_CONSTANTS_H_

ios/chrome/browser/ui/table_view/table_view_constants.mm

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ios/chrome/browser/ui/table_view/table_view_constants.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+NSString* const kTableViewEmptyViewID = @"TableViewEmptyView";

ios/chrome/browser/ui/table_view/table_view_empty_view.mm

@@ -4,6 +4,7 @@
 
 #import "ios/chrome/browser/ui/table_view/table_view_empty_view.h"
 
+#import "ios/chrome/browser/ui/table_view/table_view_constants.h"
 #import "ios/chrome/common/colors/semantic_color_names.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -84,7 +85,7 @@ NSAttributedString* GetAttributedMessage(NSString* message) {
 #pragma mark - Public
 
 + (NSString*)accessibilityIdentifier {
-  return @"TableViewEmptyView";
+  return kTableViewEmptyViewID;
 }
 
 - (void)setScrollViewContentInsets:(UIEdgeInsets)scrollViewContentInsets {

ios/chrome/test/earl_grey/BUILD.gn

@@ -272,6 +272,7 @@ source_set("test_support") {
     "//ios/chrome/browser/ui/static_content",
     "//ios/chrome/browser/ui/tab_grid:tab_grid_ui_constants",
     "//ios/chrome/browser/ui/tab_grid/grid:grid_ui_constants",
+    "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/toolbar:test_support",
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
@@ -385,6 +386,7 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/payments:payments_ui",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/qr_scanner:eg_app_support+eg2",
+    "//ios/chrome/browser/ui/reading_list:eg_app_support+eg2",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants",
     "//ios/chrome/browser/ui/safe_mode",
     "//ios/chrome/browser/ui/safe_mode:eg_app_support+eg2",
@@ -403,6 +405,7 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/static_content",
     "//ios/chrome/browser/ui/tab_grid:tab_grid_ui_constants",
     "//ios/chrome/browser/ui/tab_grid/grid:grid_ui_constants",
+    "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/toolbar:eg_app_support+eg2",
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/keyboard_assist",

ios/chrome/test/earl_grey/chrome_actions_app_interface.h

@@ -37,6 +37,12 @@
 // web state.
 + (id<GREYAction>)tapWebElement:(ElementSelector*)selector;
 
+// Action to scroll to top of a collection.
+// On iOS 13 the settings menu appears as a card that can be dismissed with a
+// downward swipe, for this reason we need to swipe up programatically to
+// avoid dismissing the VC.
++ (id<GREYAction>)scrollToTop;
+
 @end
 
 #endif  // IOS_CHROME_TEST_EARL_GREY_CHROME_ACTIONS_APP_INTERFACE_H_

ios/chrome/test/earl_grey/chrome_actions_app_interface.mm

@@ -105,4 +105,25 @@ NSString* kChromeActionsErrorDomain = @"ChromeActionsError";
                                 selector);
 }
 
++ (id<GREYAction>)scrollToTop {
+  GREYPerformBlock scrollToTopBlock = ^BOOL(id element,
+                                            __strong NSError** error) {
+    grey_dispatch_sync_on_main_thread(^{
+      UIScrollView* view = base::mac::ObjCCast<UIScrollView>(element);
+      if (!view) {
+        *error = [NSError
+            errorWithDomain:kChromeActionsErrorDomain
+                       code:0
+                   userInfo:@{
+                     NSLocalizedDescriptionKey : @"View is not a UIScrollView"
+                   }];
+      }
+      view.contentOffset = CGPointZero;
+    });
+    return YES;
+  };
+  return [GREYActionBlock actionWithName:@"Scroll to top"
+                            performBlock:scrollToTopBlock];
+}
+
 @end

ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.h

@@ -343,6 +343,9 @@
 // with custom WebKit frameworks.
 + (BOOL)isCustomWebKitLoadedIfRequested WARN_UNUSED_RESULT;
 
+// Returns YES if collections are presented in cards.
++ (BOOL)isCollectionsCardPresentationStyleEnabled WARN_UNUSED_RESULT;
+
 #pragma mark - Popup Blocking
 
 // Gets the current value of the popup content setting preference for the

ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm

@@ -15,6 +15,7 @@
 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.h"
 #import "ios/chrome/browser/ntp/features.h"
 #import "ios/chrome/browser/ui/settings/autofill/features.h"
+#import "ios/chrome/browser/ui/table_view/feature_flags.h"
 #import "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/browser/ui/util/named_guide.h"
 #import "ios/chrome/browser/web/tab_id_tab_helper.h"
@@ -587,6 +588,10 @@ using chrome_test_util::BrowserCommandDispatcherForMainBVC;
   return IsCustomWebKitLoadedIfRequested();
 }
 
++ (BOOL)isCollectionsCardPresentationStyleEnabled {
+  return IsCollectionsCardPresentationStyleEnabled();
+}
+
 #pragma mark - ScopedBlockPopupsPref
 
 + (ContentSetting)popupPrefValue {

ios/chrome/test/earl_grey/chrome_matchers.h

@@ -288,6 +288,9 @@ id<GREYMatcher> PaymentRequestPickerRow();
 // Returns matcher for the payment request search bar.
 id<GREYMatcher> PaymentRequestPickerSearchBar();
 
+// Returns matcher for the reading list on the Tools menu.
+id<GREYMatcher> ReadingListMenuButton();
+
 // Returns matcher for the bookmarks button on the Tools menu.
 id<GREYMatcher> BookmarksMenuButton();
 

ios/chrome/test/earl_grey/chrome_matchers.mm

@@ -363,6 +363,10 @@ id<GREYMatcher> PaymentRequestPickerSearchBar() {
   return [ChromeMatchersAppInterface paymentRequestPickerSearchBar];
 }
 
+id<GREYMatcher> ReadingListMenuButton() {
+  return [ChromeMatchersAppInterface readingListMenuButton];
+}
+
 id<GREYMatcher> BookmarksMenuButton() {
   return [ChromeMatchersAppInterface bookmarksMenuButton];
 }

ios/chrome/test/earl_grey/chrome_matchers_app_interface.h

@@ -293,6 +293,9 @@
 // Returns matcher for the payment request search bar.
 + (id<GREYMatcher>)paymentRequestPickerSearchBar;
 
+// Returns matcher for the reading list button on the Tools menu.
++ (id<GREYMatcher>)readingListMenuButton;
+
 // Returns matcher for the bookmarks button on the Tools menu.
 + (id<GREYMatcher>)bookmarksMenuButton;
 

ios/chrome/test/earl_grey/chrome_matchers_app_interface.mm

@@ -620,6 +620,10 @@ UIView* SubviewWithAccessibilityIdentifier(NSString* accessibility_id,
   return grey_accessibilityID(kPaymentRequestPickerSearchBarAccessibilityID);
 }
 
++ (id<GREYMatcher>)readingListMenuButton {
+  return grey_accessibilityID(kToolsMenuReadingListId);
+}
+
 + (id<GREYMatcher>)bookmarksMenuButton {
   return grey_accessibilityID(kToolsMenuBookmarksId);
 }

ios/chrome/test/earl_grey2/BUILD.gn

@@ -80,6 +80,7 @@ chrome_ios_eg2_test("ios_chrome_ui_eg2tests_module") {
     "//ios/chrome/browser/ui/page_info:eg2_tests",
     "//ios/chrome/browser/ui/popup_menu:eg2_tests",
     "//ios/chrome/browser/ui/qr_scanner:eg2_tests",
+    "//ios/chrome/browser/ui/reading_list:eg2_tests",
     "//ios/chrome/browser/ui/sad_tab:eg2_tests",
     "//ios/chrome/browser/ui/safe_mode:eg2_tests",
     "//ios/chrome/browser/ui/side_swipe:eg2_tests",