[iOS] Move AutofilProfileCollectionVC to TableVC

This Moves the AutofilProfileCollectionViewController to use a
UITableView instead of an MDCCollectionVC.
It also reset _deletionInProgress to NO after doing an update, because
it seems that it wasn't reset before (removing one entry ignored all
model updates).

Bug: 894791
Change-Id: I96b61cb71d25aae1d6974a7ae2612659803b6404
Reviewed-on: https://chromium-review.googlesource.com/c/1350956Reviewed-by: Sergio Collazos <sczs@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613054}

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

@@ -293,6 +293,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/autofill:bridges",
     "//ios/chrome/browser/ui/payments/cells",
     "//ios/chrome/browser/ui/popup_menu:constants",
+    "//ios/chrome/browser/ui/settings",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing/earl_grey:earl_grey_support",

ios/chrome/browser/ui/payments/payment_request_cancel_pay_abort_egtest.mm

@@ -11,6 +11,7 @@
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/ui/autofill/card_unmask_prompt_view_bridge.h"
 #import "ios/chrome/browser/ui/payments/payment_request_egtest_base.h"
+#import "ios/chrome/browser/ui/settings/autofill_profile_table_view_controller.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
@@ -154,7 +155,7 @@ const char kNoShippingPage[] =
 
   // Confirm that the Autofill Settings UI is showing.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
-                                          @"kAutofillCollectionViewId")]
+                                          kAutofillProfileTableViewID)]
       assertWithMatcher:grey_notNil()];
 
   [self waitForWebViewContainingTexts:{"AbortError", "Request cancelled"}];

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

@@ -18,10 +18,10 @@ source_set("settings") {
     "autofill_edit_table_view_controller+protected.h",
     "autofill_edit_table_view_controller.h",
     "autofill_edit_table_view_controller.mm",
-    "autofill_profile_collection_view_controller.h",
-    "autofill_profile_collection_view_controller.mm",
     "autofill_profile_edit_table_view_controller.h",
     "autofill_profile_edit_table_view_controller.mm",
+    "autofill_profile_table_view_controller.h",
+    "autofill_profile_table_view_controller.mm",
     "bandwidth_management_table_view_controller.h",
     "bandwidth_management_table_view_controller.mm",
     "bar_button_activity_indicator.h",
@@ -272,8 +272,8 @@ source_set("unit_tests") {
   sources = [
     "about_chrome_table_view_controller_unittest.mm",
     "autofill_credit_card_collection_view_controller_unittest.mm",
-    "autofill_profile_collection_view_controller_unittest.mm",
     "autofill_profile_edit_table_view_controller_unittest.mm",
+    "autofill_profile_table_view_controller_unittest.mm",
     "bandwidth_management_table_view_controller_unittest.mm",
     "block_popups_table_view_controller_unittest.mm",
     "clear_browsing_data_collection_view_controller_unittest.mm",

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

@@ -265,8 +265,7 @@ NSString* GetTextFieldForID(int categoryId) {
       performAction:grey_tap()];
 
   // Check the Autofill profile switch is disabled.
-  [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::LegacySettingsSwitchCell(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::SettingsSwitchCell(
                                           @"addressItem_switch", YES, NO)]
       assertWithMatcher:grey_notNil()];
 
@@ -280,20 +279,18 @@ NSString* GetTextFieldForID(int categoryId) {
   [self openAutofillProfilesSettings];
 
   // Toggle the Autofill profiles switch off.
-  [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::LegacySettingsSwitchCell(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::SettingsSwitchCell(
                                           @"addressItem_switch", YES, YES)]
-      performAction:chrome_test_util::TurnLegacySettingsSwitchOn(NO)];
+      performAction:chrome_test_util::TurnSettingsSwitchOn(NO)];
 
   // Expect Autofill profiles to remain visible.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(kProfileLabel)]
       assertWithMatcher:grey_notNil()];
 
   // Toggle the Autofill profiles switch back on.
-  [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::LegacySettingsSwitchCell(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::SettingsSwitchCell(
                                           @"addressItem_switch", NO, YES)]
-      performAction:chrome_test_util::TurnLegacySettingsSwitchOn(YES)];
+      performAction:chrome_test_util::TurnSettingsSwitchOn(YES)];
 
   // Expect Autofill profiles to remain visible.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(kProfileLabel)]

ios/chrome/browser/ui/settings/autofill_profile_collection_view_controller.h → ios/chrome/browser/ui/settings/autofill_profile_table_view_controller.h

@@ -2,26 +2,28 @@
 // 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_SETTINGS_AUTOFILL_PROFILE_COLLECTION_VIEW_CONTROLLER_H_
-#define IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_COLLECTION_VIEW_CONTROLLER_H_
+#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_TABLE_VIEW_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_TABLE_VIEW_CONTROLLER_H_
 
-#import "ios/chrome/browser/ui/settings/settings_root_collection_view_controller.h"
+#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
 
 namespace ios {
 class ChromeBrowserState;
 }  // namespace ios
 
-// The collection view for the Autofill settings.
-@interface AutofillProfileCollectionViewController
-    : SettingsRootCollectionViewController
+extern NSString* const kAutofillProfileTableViewID;
+
+// The TableView for the Autofill settings.
+@interface AutofillProfileTableViewController : SettingsRootTableViewController
 
 // The designated initializer. |browserState| must not be nil.
 - (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState
     NS_DESIGNATED_INITIALIZER;
-- (instancetype)initWithLayout:(UICollectionViewLayout*)layout
-                         style:(CollectionViewControllerStyle)style
+- (instancetype)initWithTableViewStyle:(UITableViewStyle)style
+                           appBarStyle:
+                               (ChromeTableViewControllerStyle)appBarStyle
     NS_UNAVAILABLE;
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_COLLECTION_VIEW_CONTROLLER_H_
+#endif  // IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_TABLE_VIEW_CONTROLLER_H_

ios/chrome/browser/ui/settings/autofill_profile_collection_view_controller_unittest.mm → ios/chrome/browser/ui/settings/autofill_profile_table_view_controller_unittest.mm

@@ -2,7 +2,7 @@
 // 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/settings/autofill_profile_collection_view_controller.h"
+#import "ios/chrome/browser/ui/settings/autofill_profile_table_view_controller.h"
 
 #include "base/guid.h"
 #include "base/mac/foundation_util.h"
@@ -10,10 +10,12 @@
 #import "base/test/ios/wait_util.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/autofill/personal_data_manager_factory.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#import "ios/chrome/browser/ui/collection_view/collection_view_controller_test.h"
 #include "ios/chrome/browser/ui/settings/personal_data_manager_data_changed_observer.h"
+#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
+#import "ios/chrome/browser/ui/table_view/chrome_table_view_controller_test.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -21,16 +23,12 @@
 #error "This file requires ARC support."
 #endif
 
-@interface SettingsRootCollectionViewController (ExposedForTesting)
-- (void)editButtonPressed;
-@end
-
 namespace {
 
-class AutofillProfileCollectionViewControllerTest
-    : public CollectionViewControllerTest {
+class AutofillProfileTableViewControllerTest
+    : public ChromeTableViewControllerTest {
  protected:
-  AutofillProfileCollectionViewControllerTest() {
+  AutofillProfileTableViewControllerTest() {
     TestChromeBrowserState::Builder test_cbs_builder;
     chrome_browser_state_ = test_cbs_builder.Build();
     // Profile import requires a PersonalDataManager which itself needs the
@@ -39,8 +37,8 @@ class AutofillProfileCollectionViewControllerTest
     chrome_browser_state_->CreateWebDataService();
   }
 
-  CollectionViewController* InstantiateController() override {
-    return [[AutofillProfileCollectionViewController alloc]
+  ChromeTableViewController* InstantiateController() override {
+    return [[AutofillProfileTableViewController alloc]
         initWithBrowserState:chrome_browser_state_.get()];
   }
 
@@ -65,76 +63,73 @@ class AutofillProfileCollectionViewControllerTest
 };
 
 // Default test case of no addresses.
-TEST_F(AutofillProfileCollectionViewControllerTest, TestInitialization) {
-  CreateController();
+TEST_F(AutofillProfileTableViewControllerTest, TestInitialization) {
+  ChromeTableViewController* controller =
+      ChromeTableViewControllerTest::controller();
   CheckController();
 
-  // Expect one header section and one subtitle section.
-  EXPECT_EQ(2, NumberOfSections());
+  // Expect only the header section.
+  EXPECT_EQ(1, NumberOfSections());
   // Expect header section to contain one row (the address Autofill toggle).
   EXPECT_EQ(1, NumberOfItemsInSection(0));
   // Expect subtitle section to contain one row (the address Autofill toggle
   // subtitle).
-  EXPECT_EQ(1, NumberOfItemsInSection(1));
+  EXPECT_NE(nil, [controller.tableViewModel footerForSection:0]);
+
+  // Check the footer of the first section.
+  CheckSectionFooterWithId(IDS_AUTOFILL_ENABLE_PROFILES_TOGGLE_SUBLABEL, 0);
 }
 
 // Adding a single address results in an address section.
-TEST_F(AutofillProfileCollectionViewControllerTest, TestOneProfile) {
+TEST_F(AutofillProfileTableViewControllerTest, TestOneProfile) {
   AddProfile("https://www.example.com/", "John Doe", "1 Main Street");
   CreateController();
   CheckController();
 
-  // Expect three sections (header, subtitle, and addresses section).
-  EXPECT_EQ(3, NumberOfSections());
+  // Expect two sections (header, and addresses section).
+  EXPECT_EQ(2, NumberOfSections());
   // Expect address section to contain one row (the address itself).
-  EXPECT_EQ(1, NumberOfItemsInSection(2));
+  EXPECT_EQ(1, NumberOfItemsInSection(1));
 }
 
 // Deleting the only profile results in item deletion and section deletion.
-TEST_F(AutofillProfileCollectionViewControllerTest, TestOneProfileItemDeleted) {
+TEST_F(AutofillProfileTableViewControllerTest, TestOneProfileItemDeleted) {
   AddProfile("https://www.example.com/", "John Doe", "1 Main Street");
   CreateController();
   CheckController();
 
-  // Expect three sections (header, subtitle, and addresses section).
-  EXPECT_EQ(3, NumberOfSections());
+  // Expect two sections (header and addresses section).
+  EXPECT_EQ(2, NumberOfSections());
   // Expect address section to contain one row (the address itself).
-  EXPECT_EQ(1, NumberOfItemsInSection(2));
+  EXPECT_EQ(1, NumberOfItemsInSection(1));
 
-  AutofillProfileCollectionViewController* view_controller =
-      base::mac::ObjCCastStrict<AutofillProfileCollectionViewController>(
+  AutofillProfileTableViewController* view_controller =
+      base::mac::ObjCCastStrict<AutofillProfileTableViewController>(
           controller());
-  // Put the collectionView in 'edit' mode.
+  // Put the tableView in 'edit' mode.
   [view_controller editButtonPressed];
 
-  // This is a bit of a shortcut, since actually clicking on the 'delete'
-  // button would be tough.
-  void (^delete_item_with_wait)(int, int) = ^(int i, int j) {
-    __block BOOL completion_called = NO;
-    this->DeleteItem(i, j, ^{
-      completion_called = YES;
-    });
-    EXPECT_TRUE(base::test::ios::WaitUntilConditionOrTimeout(
-        base::test::ios::kWaitForUIElementTimeout, ^bool() {
-          return completion_called;
-        }));
-  };
-
   autofill::PersonalDataManager* personal_data_manager =
       autofill::PersonalDataManagerFactory::GetForBrowserState(
           chrome_browser_state_.get());
   PersonalDataManagerDataChangedObserver observer(personal_data_manager);
 
-  // This call cause a modification of the PersonalDataManager, so wait until
-  // the asynchronous task complete in addition to waiting for the UI update.
-  delete_item_with_wait(2, 0);
-  observer.Wait();  // Wait for completion of the asynchronous operation.
+  AutofillProfileTableViewController* autofill_controller =
+      static_cast<AutofillProfileTableViewController*>(controller());
+  [autofill_controller deleteItems:@[ [NSIndexPath indexPathForRow:0
+                                                         inSection:1] ]];
+
+  // Verify the resulting UI.
+  EXPECT_TRUE(base::test::ios::WaitUntilConditionOrTimeout(
+      base::test::ios::kWaitForUIElementTimeout, ^bool() {
+        return NumberOfSections() == 1;
+      }));
 
   // Exit 'edit' mode.
   [view_controller editButtonPressed];
 
   // Expect address section to have been removed.
-  EXPECT_EQ(2, NumberOfSections());
+  EXPECT_EQ(1, NumberOfSections());
 }
 
 }  // namespace

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

@@ -45,7 +45,7 @@
 #import "ios/chrome/browser/ui/settings/about_chrome_table_view_controller.h"
 #import "ios/chrome/browser/ui/settings/accounts_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/autofill_credit_card_collection_view_controller.h"
-#import "ios/chrome/browser/ui/settings/autofill_profile_collection_view_controller.h"
+#import "ios/chrome/browser/ui/settings/autofill_profile_table_view_controller.h"
 #import "ios/chrome/browser/ui/settings/bandwidth_management_table_view_controller.h"
 #import "ios/chrome/browser/ui/settings/cells/account_signin_item.h"
 #import "ios/chrome/browser/ui/settings/cells/legacy/legacy_settings_detail_item.h"
@@ -867,7 +867,7 @@ void IdentityObserverBridge::OnPrimaryAccountCleared(
           initWithBrowserState:_browserState];
       break;
     case ItemTypeAutofillProfile:
-      controller = [[AutofillProfileCollectionViewController alloc]
+      controller = [[AutofillProfileTableViewController alloc]
           initWithBrowserState:_browserState];
       break;
     case ItemTypeVoiceSearch:

ios/chrome/browser/ui/settings/settings_navigation_controller.h

@@ -104,7 +104,7 @@ newImportDataController:(ios::ChromeBrowserState*)browserState
                 toEmail:(NSString*)toEmail
              isSignedIn:(BOOL)isSignedIn;
 
-// Creates a new AutofillProfileCollectionViewController and the chrome around
+// Creates a new AutofillProfileTableViewController and the chrome around
 // it. |browserState| is used to personalize some settings aspects and should
 // not be nil. |delegate| may be nil.
 + (SettingsNavigationController*)

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

@@ -15,7 +15,7 @@
 #import "ios/chrome/browser/ui/material_components/utils.h"
 #import "ios/chrome/browser/ui/settings/accounts_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/autofill_credit_card_collection_view_controller.h"
-#import "ios/chrome/browser/ui/settings/autofill_profile_collection_view_controller.h"
+#import "ios/chrome/browser/ui/settings/autofill_profile_table_view_controller.h"
 #import "ios/chrome/browser/ui/settings/google_services_settings_coordinator.h"
 #import "ios/chrome/browser/ui/settings/google_services_settings_view_controller.h"
 #import "ios/chrome/browser/ui/settings/import_data_table_view_controller.h"
@@ -242,8 +242,8 @@ newImportDataController:(ios::ChromeBrowserState*)browserState
 newAutofillProfilleController:(ios::ChromeBrowserState*)browserState
                      delegate:
                          (id<SettingsNavigationControllerDelegate>)delegate {
-  AutofillProfileCollectionViewController* controller =
-      [[AutofillProfileCollectionViewController alloc]
+  AutofillProfileTableViewController* controller =
+      [[AutofillProfileTableViewController alloc]
           initWithBrowserState:browserState];
   controller.dispatcher = [delegate dispatcherForSettings];
 
@@ -561,8 +561,8 @@ initWithRootViewController:(UIViewController*)rootViewController
 // TODO(crbug.com/779791) : Do not pass |baseViewController| through dispatcher.
 - (void)showProfileSettingsFromViewController:
     (UIViewController*)baseViewController {
-  AutofillProfileCollectionViewController* controller =
-      [[AutofillProfileCollectionViewController alloc]
+  AutofillProfileTableViewController* controller =
+      [[AutofillProfileTableViewController alloc]
           initWithBrowserState:mainBrowserState_];
   controller.dispatcher = [delegate_ dispatcherForSettings];
   [self pushViewController:controller animated:YES];