Add a ScopedFeatureList class for testing and start using it.

components/password_manager/core/browser/password_manager_test_utils.cc

Index: components/password_manager/core/browser/password_manager_test_utils.cc
diff --git a/components/password_manager/core/browser/password_manager_test_utils.cc b/components/password_manager/core/browser/password_manager_test_utils.cc
index 39eca2fc674feecf1062d9a8e228d1c91df5e261..aa58692e9236a1c9e475169d3bf8697a1e03247b 100644
--- a/components/password_manager/core/browser/password_manager_test_utils.cc
+++ b/components/password_manager/core/browser/password_manager_test_utils.cc
@@ -16,18 +16,6 @@ using autofill::PasswordForm;
 
 namespace password_manager {
 
-namespace {
-
-void GetFeatureOverridesAsCSV(const std::vector<const base::Feature*>& features,
-                              std::string* overrides) {
-  for (const base::Feature* feature : features) {
-    overrides->append(feature->name);
-    overrides->push_back(',');
-  }
-}
-
-}  // namespace
-
 const char kTestingIconUrlSpec[] = "https://accounts.google.com/Icon";
 const char kTestingFederationUrlSpec[] = "https://accounts.google.com/login";
 const int kTestingDaysAfterPasswordsAreSynced = 1;
@@ -107,20 +95,6 @@ bool ContainsEqualPasswordFormsUnordered(
   return !had_mismatched_actual_form && remaining_expectations.empty();
 }
 
-void SetFeatures(const std::vector<const base::Feature*>& enable_features,
-                 const std::vector<const base::Feature*>& disable_features,
-                 std::unique_ptr<base::FeatureList> feature_list) {
-  std::string enable_overrides;
-  std::string disable_overrides;
-
-  GetFeatureOverridesAsCSV(enable_features, &enable_overrides);
-  GetFeatureOverridesAsCSV(disable_features, &disable_overrides);
-
-  base::FeatureList::ClearInstanceForTesting();
-  feature_list->InitializeFromCommandLine(enable_overrides, disable_overrides);
-  base::FeatureList::SetInstance(std::move(feature_list));
-}
-
 MockPasswordStoreObserver::MockPasswordStoreObserver() {}
 
 MockPasswordStoreObserver::~MockPasswordStoreObserver() {}