[ios] Move password settings tests to EG2

Bug: 987646
Change-Id: I9e21ec812293136797b80af8c4b189331941a111
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1903363Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: David Jean <djean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715258}

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

@@ -29,6 +29,7 @@ source_set("cells") {
     "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/common/colors",
     "//ios/chrome/common/ui_util",
     "//ios/public/provider/chrome/browser",

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

@@ -90,6 +90,7 @@ source_set("history_ui") {
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/common/favicon",

ios/chrome/browser/ui/infobars/modals/BUILD.gn

@@ -26,6 +26,7 @@ source_set("modals") {
     "//ios/chrome/browser/passwords:public",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ui/base",
   ]

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

@@ -85,6 +85,7 @@ source_set("recent_tabs_ui") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",

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

@@ -44,6 +44,7 @@ source_set("send_tab_to_self_ui") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/common/colors",
     "//ui/base",
   ]

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

@@ -15,6 +15,7 @@ source_set("settings_root") {
     "settings_root_view_controlling.h",
   ]
   deps = [
+    ":settings_root_constants",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ui:feature_flags",
@@ -37,6 +38,17 @@ source_set("settings_root") {
   ]
 }
 
+source_set("settings_root_constants") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "settings_root_table_constants.h",
+    "settings_root_table_constants.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("settings") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -169,6 +181,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/table_view/cells/resources:table_view_cell_check_mark",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web:web",

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

@@ -53,6 +53,7 @@ source_set("autofill") {
     "//ios/chrome/browser/ui/settings/credit_card_scanner",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/colors",
     "//ui/base",

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

@@ -10,6 +10,7 @@ source_set("cells") {
 
   deps = [
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]

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

@@ -50,6 +50,7 @@ source_set("cells") {
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/colors",
     "//ios/chrome/common/ui_util",

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

@@ -55,6 +55,7 @@ source_set("clear_browsing_data") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/common",
     "//ios/chrome/common/colors",
     "//ios/public/provider/chrome/browser",

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

@@ -69,6 +69,7 @@ source_set("google_services") {
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/signin_interaction",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/colors",
     "//ios/public/provider/chrome/browser",

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

@@ -53,6 +53,7 @@ source_set("language_ui") {
     "//ios/chrome/browser/ui/settings/language/cells",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/colors",
     "//ios/chrome/common/ui_util",

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

@@ -17,6 +17,7 @@ source_set("password") {
     "reauthentication_protocol.h",
   ]
   deps = [
+    ":password_constants",
     "//base",
     "//components/autofill/core/common",
     "//components/google/core/common",
@@ -40,6 +41,7 @@ source_set("password") {
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/colors",
     "//ios/chrome/common/ui_util",
@@ -49,6 +51,17 @@ source_set("password") {
   ]
 }
 
+source_set("password_constants") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "passwords_table_view_constants.h",
+    "passwords_table_view_constants.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("test_support") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -87,6 +100,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/ui/table_view:test_support",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:test_support",
     "//ios/chrome/common/colors",
@@ -102,11 +116,13 @@ source_set("unit_tests") {
   ]
 }
 
-source_set("eg_tests") {
+source_set("eg_test_support") {
+  defines = [ "CHROME_EARL_GREY_1" ]
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "passwords_settings_egtest.mm",
+    "passwords_settings_app_interface.h",
+    "passwords_settings_app_interface.mm",
   ]
   deps = [
     ":password",
@@ -117,16 +133,37 @@ source_set("eg_tests") {
     "//components/password_manager/core/browser",
     "//components/password_manager/core/common",
     "//components/prefs",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/passwords",
+    "//ios/chrome/test/app:test_support",
+    "//ios/third_party/material_components_ios",
+    "//url",
+  ]
+}
+
+source_set("eg_tests") {
+  defines = [ "CHROME_EARL_GREY_1" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "passwords_settings_egtest.mm",
+  ]
+  deps = [
+    ":eg_test_support",
+    ":password_constants",
+    "//base",
+    "//base/test:test_support",
     "//components/strings",
     "//components/ukm/ios:features",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/passwords",
-    "//ios/chrome/browser/ui/settings",
+    "//ios/chrome/browser/ui/settings:settings_root_constants",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
+    "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/material_components_ios",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test:element_selector",
@@ -136,3 +173,78 @@ source_set("eg_tests") {
     "//url",
   ]
 }
+
+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 = [
+    "passwords_settings_app_interface.h",
+    "passwords_settings_app_interface.mm",
+  ]
+  deps = [
+    ":password",
+    "//base",
+    "//base/test:test_support",
+    "//components/autofill/core/common",
+    "//components/keyed_service/core",
+    "//components/password_manager/core/browser",
+    "//components/password_manager/core/common",
+    "//components/prefs",
+    "//components/strings:components_strings_grit",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/passwords",
+    "//ios/chrome/test/app:test_support",
+    "//ios/testing/earl_grey:eg_app_support+eg2",
+    "//ios/third_party/material_components_ios",
+    "//url",
+  ]
+}
+
+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 = [
+    "passwords_settings_app_interface.h",
+  ]
+}
+
+source_set("eg2_tests") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [
+    "passwords_settings_egtest.mm",
+  ]
+  deps = [
+    ":eg_test_support+eg2",
+    ":password_constants",
+    "//base:base",
+    "//base/test:test_support",
+    "//components/strings:components_strings_grit",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/settings:settings_root_constants",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
+    "//ios/chrome/browser/ui/util",
+    "//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/test:element_selector",
+    "//ios/web/public/test/http_server:http_server",
+    "//ui/base",
+    "//url",
+  ]
+  libs = [ "UIKit.framework" ]
+}

ios/chrome/browser/ui/settings/password/password_details_table_view_controller.h

@@ -12,10 +12,6 @@ namespace autofill {
 struct PasswordForm;
 }  // namespace autofill
 
-// The accessibility identifier of the password details table view.
-extern NSString* _Nonnull const kPasswordDetailsTableViewId;
-extern NSString* _Nonnull const kPasswordDetailsDeletionAlertViewId;
-
 @protocol ReauthenticationProtocol;
 
 // Displays details of a password item, including URL of the site, username and

ios/chrome/browser/ui/settings/password/password_details_table_view_controller.mm

@@ -16,6 +16,7 @@
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
+#import "ios/chrome/browser/ui/settings/password/passwords_table_view_constants.h"
 #import "ios/chrome/browser/ui/settings/password/passwords_table_view_controller.h"
 #import "ios/chrome/browser/ui/settings/password/reauthentication_module.h"
 #import "ios/chrome/browser/ui/settings/utils/settings_utils.h"
@@ -34,10 +35,6 @@
 #error "This file requires ARC support."
 #endif
 
-NSString* const kPasswordDetailsTableViewId = @"PasswordDetailsTableViewId";
-NSString* const kPasswordDetailsDeletionAlertViewId =
-    @"PasswordDetailsDeletionAlertViewId";
-
 namespace {
 
 typedef NS_ENUM(NSInteger, SectionIdentifier) {

ios/chrome/browser/ui/settings/password/passwords_settings_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_SETTINGS_PASSWORD_PASSWORDS_SETTINGS_APP_INTERFACE_H_
+#define IOS_CHROME_BROWSER_UI_SETTINGS_PASSWORD_PASSWORDS_SETTINGS_APP_INTERFACE_H_
+
+#import <UIKit/UIKit.h>
+
+// EarlGreyScopedBlockSwizzlerAppInterface 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 PasswordSettingsAppInterface : NSObject
+
+// Sets a re-authentication mock (i.e. what asks user for fingerprint to
+// view password) and its options for next test.
++ (void)setUpMockReauthenticationModule;
++ (void)setUpMockReauthenticationModuleForExport;
++ (void)mockReauthenticationModuleShouldSucceed:(BOOL)shouldSucceed;
++ (void)mockReauthenticationModuleCanAttempt:(BOOL)canAttempt;
+
+// Dismisses snack bar.  Used before next test.
++ (void)dismissSnackBar;
+
+// Removes all credentials stored.
++ (BOOL)clearPasswordStore;
+
+// Creates multiple password form with index being part of the username,
+// password, origin and realm.
++ (void)saveExamplePasswordWithCount:(NSInteger)count;
+
+// Creates password form for given fields.
++ (BOOL)saveExamplePassword:(NSString*)password
+                   userName:(NSString*)userName
+                     origin:(NSString*)origin;
+
+// Creates a blacklisted password form for given origin.
++ (BOOL)saveExampleBlacklistedOrigin:(NSString*)origin;
+
+// Creates a federated password form for given origins and user.
++ (BOOL)saveExampleFederatedOrigin:(NSString*)federatedOrigin
+                          userName:(NSString*)userName
+                            origin:(NSString*)origin;
+
+// Gets number of password form stored.
++ (NSInteger)passwordStoreResultsCount;
+
+// Returns YES is crdential service is enabled.
++ (BOOL)isCredentialsServiceEnabled;
+
+@end
+
+#endif  // IOS_CHROME_BROWSER_UI_SETTINGS_PASSWORD_PASSWORDS_SETTINGS_APP_INTERFACE_H_

ios/chrome/browser/ui/settings/password/passwords_settings_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.
+
+#include "ios/chrome/browser/ui/settings/password/passwords_settings_app_interface.h"
+
+#include "base/strings/sys_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
+#import "base/test/ios/wait_util.h"
+#include "components/autofill/core/common/password_form.h"
+#include "components/keyed_service/core/service_access_type.h"
+#include "components/password_manager/core/browser/password_store.h"
+#include "components/password_manager/core/browser/password_store_consumer.h"
+#include "components/password_manager/core/common/password_manager_pref_names.h"
+#include "components/prefs/pref_service.h"
+#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
+#include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
+#import "ios/chrome/test/app/chrome_test_util.h"
+#import "ios/chrome/test/app/password_test_util.h"
+#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
+#include "url/gurl.h"
+#include "url/origin.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+using autofill::PasswordForm;
+using chrome_test_util::SetUpAndReturnMockReauthenticationModule;
+using chrome_test_util::SetUpAndReturnMockReauthenticationModuleForExport;
+
+namespace {
+
+scoped_refptr<password_manager::PasswordStore> GetPasswordStore() {
+  // ServiceAccessType governs behaviour in Incognito: only modifications with
+  // EXPLICIT_ACCESS, which correspond to user's explicit gesture, succeed.
+  // This test does not deal with Incognito, and should not run in Incognito
+  // context. Therefore IMPLICIT_ACCESS is used to let the test fail if in
+  // Incognito context.
+  return IOSChromePasswordStoreFactory::GetForBrowserState(
+      chrome_test_util::GetOriginalBrowserState(),
+      ServiceAccessType::IMPLICIT_ACCESS);
+}
+
+// This class is used to obtain results from the PasswordStore and hence both
+// check the success of store updates and ensure that store has finished
+// processing.
+class FakeStoreConsumer : public password_manager::PasswordStoreConsumer {
+ public:
+  void OnGetPasswordStoreResults(
+      std::vector<std::unique_ptr<autofill::PasswordForm>> obtained) override {
+    obtained_ = std::move(obtained);
+  }
+
+  bool FetchStoreResults() {
+    results_.clear();
+    ResetObtained();
+    GetPasswordStore()->GetAllLogins(this);
+    bool responded = base::test::ios::WaitUntilConditionOrTimeout(2.0, ^bool {
+      return !AreObtainedReset();
+    });
+    if (responded) {
+      AppendObtainedToResults();
+    }
+    return responded;
+  }
+
+  const std::vector<autofill::PasswordForm>& GetStoreResults() {
+    return results_;
+  }
+
+ private:
+  // Puts |obtained_| in a known state not corresponding to any PasswordStore
+  // state.
+  void ResetObtained() {
+    obtained_.clear();
+    obtained_.emplace_back(nullptr);
+  }
+
+  // Returns true if |obtained_| are in the reset state.
+  bool AreObtainedReset() { return obtained_.size() == 1 && !obtained_[0]; }
+
+  void AppendObtainedToResults() {
+    for (const auto& source : obtained_) {
+      results_.emplace_back(*source);
+    }
+    ResetObtained();
+  }
+
+  // Temporary cache of obtained store results.
+  std::vector<std::unique_ptr<autofill::PasswordForm>> obtained_;
+
+  // Combination of fillable and blacklisted credentials from the store.
+  std::vector<autofill::PasswordForm> results_;
+};
+
+// Saves |form| to the password store and waits until the async processing is
+// done.
+bool SaveToPasswordStore(const PasswordForm& form) {
+  GetPasswordStore()->AddLogin(form);
+  // When we retrieve the form from the store, |from_store| should be set.
+  autofill::PasswordForm expected_form = form;
+  expected_form.from_store = autofill::PasswordForm::Store::kProfileStore;
+  // Check the result and ensure PasswordStore processed this.
+  FakeStoreConsumer consumer;
+  if (!consumer.FetchStoreResults()) {
+    return false;
+  }
+  for (const auto& result : consumer.GetStoreResults()) {
+    if (result == expected_form)
+      return true;
+  }
+  return false;
+}
+
+// Creates a PasswordForm with |index| being part of the username, password,
+// origin and realm.
+PasswordForm CreateSampleFormWithIndex(int index) {
+  PasswordForm form;
+  form.username_value =
+      base::ASCIIToUTF16(base::StringPrintf("concrete username %02d", index));
+  form.password_value =
+      base::ASCIIToUTF16(base::StringPrintf("concrete password %02d", index));
+  form.origin = GURL(base::StringPrintf("https://www%02d.example.com", index));
+  form.signon_realm = form.origin.spec();
+  return form;
+}
+
+bool ClearPasswordStore() {
+  GetPasswordStore()->RemoveLoginsCreatedBetween(base::Time(), base::Time(),
+                                                 base::Closure());
+  FakeStoreConsumer consumer;
+  if (!consumer.FetchStoreResults()) {
+    return false;
+  }
+  return consumer.GetStoreResults().empty();
+}
+
+}  // namespace
+
+@implementation PasswordSettingsAppInterface
+
+static MockReauthenticationModule* _mockReauthenticationModule;
+
++ (void)setUpMockReauthenticationModule {
+  _mockReauthenticationModule = SetUpAndReturnMockReauthenticationModule();
+}
+
++ (void)setUpMockReauthenticationModuleForExport {
+  _mockReauthenticationModule =
+      SetUpAndReturnMockReauthenticationModuleForExport();
+}
+
++ (void)mockReauthenticationModuleShouldSucceed:(BOOL)shouldSucceed {
+  _mockReauthenticationModule.shouldSucceed = shouldSucceed;
+}
+
++ (void)mockReauthenticationModuleCanAttempt:(BOOL)canAttempt {
+  _mockReauthenticationModule.canAttempt = canAttempt;
+}
+
++ (void)dismissSnackBar {
+  [MDCSnackbarManager
+      dismissAndCallCompletionBlocksWithCategory:@"PasswordsSnackbarCategory"];
+}
+
++ (void)saveExamplePasswordWithCount:(NSInteger)count {
+  for (int i = 1; i <= count; ++i) {
+    GetPasswordStore()->AddLogin(CreateSampleFormWithIndex(i));
+  }
+}
+
++ (BOOL)saveExamplePassword:(NSString*)password
+                   userName:(NSString*)userName
+                     origin:(NSString*)origin {
+  PasswordForm example;
+  example.username_value = base::SysNSStringToUTF16(userName);
+  example.password_value = base::SysNSStringToUTF16(password);
+  example.origin = GURL(base::SysNSStringToUTF16(origin));
+  example.signon_realm = example.origin.spec();
+  return SaveToPasswordStore(example);
+}
+
++ (BOOL)saveExampleBlacklistedOrigin:(NSString*)origin {
+  PasswordForm example;
+  example.origin = GURL(base::SysNSStringToUTF16(origin));
+  example.blacklisted_by_user = true;
+  example.signon_realm = example.origin.spec();
+  return SaveToPasswordStore(example);
+}
+
++ (BOOL)saveExampleFederatedOrigin:(NSString*)federatedOrigin
+                          userName:(NSString*)userName
+                            origin:(NSString*)origin {
+  PasswordForm federated;
+  federated.username_value = base::SysNSStringToUTF16(userName);
+  federated.origin = GURL(base::SysNSStringToUTF16(origin));
+  federated.signon_realm = federated.origin.spec();
+  federated.federation_origin =
+      url::Origin::Create(GURL(base::SysNSStringToUTF16(federatedOrigin)));
+  return SaveToPasswordStore(federated);
+}
+
++ (NSInteger)passwordStoreResultsCount {
+  FakeStoreConsumer consumer;
+  if (!consumer.FetchStoreResults()) {
+    return -1;
+  }
+  return consumer.GetStoreResults().size();
+}
+
++ (BOOL)clearPasswordStore {
+  return ClearPasswordStore();
+}
+
++ (BOOL)isCredentialsServiceEnabled {
+  ios::ChromeBrowserState* browserState =
+      chrome_test_util::GetOriginalBrowserState();
+  return browserState->GetPrefs()->GetBoolean(
+      password_manager::prefs::kCredentialsEnableService);
+}
+
+@end

ios/chrome/browser/ui/settings/password/passwords_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_SETTINGS_PASSWORD_PASSWORDS_TABLE_VIEW_CONSTANTS_H_
+#define IOS_CHROME_BROWSER_UI_SETTINGS_PASSWORD_PASSWORDS_TABLE_VIEW_CONSTANTS_H_
+
+#import <Foundation/Foundation.h>
+
+// The accessibility identifier of the password details table view.
+extern NSString* const kPasswordsTableViewId;
+extern NSString* const kPasswordsExportConfirmViewId;
+extern NSString* const kPasswordsSearchBarId;
+extern NSString* const kPasswordsScrimViewId;
+
+// The accessibility identifier of the password details table view.
+extern NSString* const kPasswordDetailsTableViewId;
+extern NSString* const kPasswordDetailsDeletionAlertViewId;
+
+#endif  // IOS_CHROME_BROWSER_UI_SETTINGS_PASSWORD_PASSWORDS_TABLE_VIEW_CONSTANTS_H_

ios/chrome/browser/ui/settings/password/passwords_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/settings/password/passwords_table_view_constants.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+NSString* const kPasswordsTableViewId = @"PasswordsTableViewId";
+NSString* const kPasswordsExportConfirmViewId = @"PasswordsExportConfirmViewId";
+NSString* const kPasswordsSearchBarId = @"PasswordsSearchBar";
+NSString* const kPasswordsScrimViewId = @"PasswordsScrimViewId";
+
+NSString* const kPasswordDetailsTableViewId = @"PasswordDetailsTableViewId";
+NSString* const kPasswordDetailsDeletionAlertViewId =
+    @"PasswordDetailsDeletionAlertViewId";

ios/chrome/browser/ui/settings/password/passwords_table_view_controller.h

@@ -13,12 +13,6 @@ namespace ios {
 class ChromeBrowserState;
 }  // namespace ios
 
-// The accessibility identifier of the password details table view.
-extern NSString* const kPasswordsTableViewId;
-extern NSString* const kPasswordsExportConfirmViewId;
-extern NSString* const kPasswordsSearchBarId;
-extern NSString* const kPasswordsScrimViewId;
-
 @protocol ReauthenticationProtocol;
 @class PasswordExporter;
 

ios/chrome/browser/ui/settings/password/passwords_table_view_controller.mm

@@ -40,6 +40,7 @@
 #import "ios/chrome/browser/ui/settings/password/password_details_table_view_controller.h"
 #import "ios/chrome/browser/ui/settings/password/password_details_table_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/settings/password/password_exporter.h"
+#import "ios/chrome/browser/ui/settings/password/passwords_table_view_constants.h"
 #import "ios/chrome/browser/ui/settings/password/reauthentication_module.h"
 #import "ios/chrome/browser/ui/settings/utils/pref_backed_boolean.h"
 #import "ios/chrome/browser/ui/settings/utils/settings_utils.h"
@@ -63,11 +64,6 @@
 #error "This file requires ARC support."
 #endif
 
-NSString* const kPasswordsTableViewId = @"PasswordsTableViewId";
-NSString* const kPasswordsExportConfirmViewId = @"PasswordsExportConfirmViewId";
-NSString* const kPasswordsSearchBarId = @"PasswordsSearchBar";
-NSString* const kPasswordsScrimViewId = @"PasswordsScrimViewId";
-
 namespace {
 
 typedef NS_ENUM(NSInteger, SectionIdentifier) {

ios/chrome/browser/ui/settings/settings_root_table_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_SETTINGS_SETTINGS_ROOT_TABLE_CONSTANTS_H_
+#define IOS_CHROME_BROWSER_UI_SETTINGS_SETTINGS_ROOT_TABLE_CONSTANTS_H_
+
+#import <Foundation/Foundation.h>
+
+extern NSString* const kSettingsToolbarDeleteButtonId;
+
+#endif  // IOS_CHROME_BROWSER_UI_SETTINGS_SETTINGS_ROOT_TABLE_CONSTANTS_H_

ios/chrome/browser/ui/settings/settings_root_table_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/settings/settings_root_table_constants.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+NSString* const kSettingsToolbarDeleteButtonId =
+    @"SettingsToolbarDeleteButtonId";

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

@@ -12,8 +12,6 @@
 #import "ios/chrome/browser/ui/table_view/cells/table_view_link_header_footer_item.h"
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
 
-extern NSString* const kSettingsToolbarDeleteButtonId;
-
 // SettingsRootTableViewController is a base class for integrating UITableViews
 // into the Settings UI.  It handles the configuration and display of the MDC
 // AppBar.

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

@@ -11,6 +11,7 @@
 #import "ios/chrome/browser/ui/settings/bar_button_activity_indicator.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_cells_constants.h"
 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
+#import "ios/chrome/browser/ui/settings/settings_root_table_constants.h"
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_styler.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
@@ -41,9 +42,6 @@ const CGFloat kActivityIndicatorDimensionIPad = 64;
 const CGFloat kActivityIndicatorDimensionIPhone = 56;
 }  // namespace
 
-NSString* const kSettingsToolbarDeleteButtonId =
-    @"SettingsToolbarDeleteButtonId";
-
 @interface SettingsRootTableViewController ()
 
 // Delete button for the toolbar.

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

@@ -43,6 +43,7 @@ source_set("sync") {
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/colors",
     "//ios/public/provider/chrome/browser",

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

@@ -8,8 +8,6 @@ source_set("cells") {
     "table_view_activity_indicator_header_footer_item.mm",
     "table_view_cell.h",
     "table_view_cell.mm",
-    "table_view_cells_constants.h",
-    "table_view_cells_constants.mm",
     "table_view_detail_icon_item.h",
     "table_view_detail_icon_item.mm",
     "table_view_detail_text_item.h",
@@ -44,6 +42,7 @@ source_set("cells") {
   ]
 
   deps = [
+    ":cells_constants",
     "resources:table_view_cell_chevron",
     "resources:table_view_cell_edit_icon",
     "resources:table_view_cell_error_icon",
@@ -70,6 +69,17 @@ source_set("cells") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
+source_set("cells_constants") {
+  sources = [
+    "table_view_cells_constants.h",
+    "table_view_cells_constants.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("unit_tests") {
   testonly = true
   sources = [
@@ -88,6 +98,7 @@ source_set("unit_tests") {
 
   deps = [
     ":cells",
+    ":cells_constants",
     "//base",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/common/colors",

ios/chrome/test/earl_grey/BUILD.gn

@@ -258,7 +258,7 @@ source_set("test_support") {
     "//ios/chrome/browser/ui/safe_mode",
     "//ios/chrome/browser/ui/safe_mode:test_support",
     "//ios/chrome/browser/ui/settings:settings",
-    "//ios/chrome/browser/ui/settings:settings_root",
+    "//ios/chrome/browser/ui/settings:settings_root_constants",
     "//ios/chrome/browser/ui/settings/autofill",
     "//ios/chrome/browser/ui/settings/autofill:constants",
     "//ios/chrome/browser/ui/settings/autofill:feature_flags",
@@ -266,7 +266,8 @@ source_set("test_support") {
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
     "//ios/chrome/browser/ui/settings/credit_card_scanner",
     "//ios/chrome/browser/ui/settings/google_services",
-    "//ios/chrome/browser/ui/settings/password",
+    "//ios/chrome/browser/ui/settings/password:eg_test_support",
+    "//ios/chrome/browser/ui/settings/password:password_constants",
     "//ios/chrome/browser/ui/settings/sync",
     "//ios/chrome/browser/ui/static_content",
     "//ios/chrome/browser/ui/tab_grid:tab_grid_ui_constants",
@@ -383,6 +384,7 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/fullscreen/test:eg_app_support+eg2",
     "//ios/chrome/browser/ui/history:constants",
     "//ios/chrome/browser/ui/location_bar:location_bar",
+    "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/payments:payments_ui",
     "//ios/chrome/browser/ui/popup_menu:constants",
@@ -393,7 +395,7 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/safe_mode:eg_app_support+eg2",
     "//ios/chrome/browser/ui/settings:eg_app_support+eg2",
     "//ios/chrome/browser/ui/settings:settings",
-    "//ios/chrome/browser/ui/settings:settings_root",
+    "//ios/chrome/browser/ui/settings:settings_root_constants",
     "//ios/chrome/browser/ui/settings/autofill",
     "//ios/chrome/browser/ui/settings/autofill:constants",
     "//ios/chrome/browser/ui/settings/autofill:feature_flags",
@@ -401,7 +403,8 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
     "//ios/chrome/browser/ui/settings/credit_card_scanner",
     "//ios/chrome/browser/ui/settings/google_services",
-    "//ios/chrome/browser/ui/settings/password",
+    "//ios/chrome/browser/ui/settings/password:eg_app_support+eg2",
+    "//ios/chrome/browser/ui/settings/password:password_constants",
     "//ios/chrome/browser/ui/settings/sync",
     "//ios/chrome/browser/ui/static_content",
     "//ios/chrome/browser/ui/tab_grid:tab_grid_ui_constants",
@@ -421,6 +424,7 @@ source_set("eg_app_support+eg2") {
     "//ios/testing/earl_grey:eg_app_support+eg2",
     "//ios/third_party/earl_grey2:app_framework+link",
     "//ios/third_party/gtx:gtx+link",
+    "//ios/third_party/material_components_ios",
     "//ios/web:eg_app_support+eg2",
     "//ios/web/common",
     "//ios/web/public",
@@ -478,6 +482,7 @@ source_set("eg_test_support+eg2") {
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants",
     "//ios/chrome/browser/ui/safe_mode:eg_test_support+eg2",
+    "//ios/chrome/browser/ui/settings/password:eg_test_support+eg2",
     "//ios/chrome/browser/ui/tab_grid:tab_grid_ui_constants",
     "//ios/chrome/browser/ui/tab_grid/grid:grid_ui_constants",
     "//ios/chrome/browser/ui/toolbar:eg_test_support+eg2",

ios/chrome/test/earl_grey/chrome_matchers_app_interface.mm

@@ -44,9 +44,9 @@
 #import "ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller.h"
 #import "ios/chrome/browser/ui/settings/google_services/advanced_signin_settings_coordinator.h"
 #import "ios/chrome/browser/ui/settings/import_data_table_view_controller.h"
-#import "ios/chrome/browser/ui/settings/password/passwords_table_view_controller.h"
+#import "ios/chrome/browser/ui/settings/password/passwords_table_view_constants.h"
 #import "ios/chrome/browser/ui/settings/privacy_table_view_controller.h"
-#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
+#import "ios/chrome/browser/ui/settings/settings_root_table_constants.h"
 #import "ios/chrome/browser/ui/settings/settings_table_view_controller.h"
 #import "ios/chrome/browser/ui/static_content/static_html_view_controller.h"
 #import "ios/chrome/browser/ui/tab_grid/grid/grid_constants.h"
@@ -544,9 +544,16 @@ UIView* SubviewWithAccessibilityIdentifier(NSString* accessibility_id,
       SubviewWithAccessibilityIdentifier(
           @"SettingNavigationBar",
           [[UIApplication sharedApplication] keyWindow]));
+#if defined(CHROME_EARL_GREY_2)
+  id<GREYMatcher> buttonLabelClassMatcher = grey_anyOf(
+      grey_kindOfClassName(@"UIButton"),
+      grey_kindOfClassName(@"UIAccessibilityBackButtonElement"), nil);
+#else
+  id<GREYMatcher> buttonLabelClassMatcher = grey_kindOfClass([UIButton class]);
+#endif
   return grey_allOf(grey_anyOf(grey_accessibilityLabel(navBar.backItem.title),
                                grey_accessibilityLabel(@"Back"), nil),
-                    grey_kindOfClass([UIButton class]),
+                    buttonLabelClassMatcher,
                     grey_ancestor(grey_kindOfClass([UINavigationBar class])),
                     nil);
 }

ios/chrome/test/earl_grey2/BUILD.gn

@@ -62,6 +62,7 @@ chrome_ios_eg2_test("ios_chrome_settings_eg2tests_module") {
   deps = [
     "//ios/chrome/browser/ui/settings:eg2_tests",
     "//ios/chrome/browser/ui/settings/autofill:eg2_tests",
+    "//ios/chrome/browser/ui/settings/password:eg2_tests",
   ]
 }