Remove experiment support for PasswordManagerSettingsBehaviourChange

chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc

Index: chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc
index 76078e0431ef80875f921bc863f16010cae9a0ab..b0b6ad526a51d07cc990bbc2b65f51ca823201cb 100644
--- a/chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc
@@ -31,13 +31,6 @@ const char kPasswordManagerSettingMigrationFieldTrialName[] =
 const char kEnabledPasswordManagerSettingsMigrationGroupName[] = "Enable";
 const char kDisablePasswordManagerSettingsMigrationGroupName[] = "Disable";
 
-const char kPasswordManagerSettingsBehaviourChangeFieldTrialName[] =
-    "PasswordManagerSettingsBehaviourChange";
-const char kPasswordManagerSettingsBehaviourChangeEnabledGroupName[] =
-    "PasswordManagerSettingsBehaviourChange.Active";
-const char kPasswordManagerSettingsBehaviourChangeDisabledGroupName[] =
-    "PasswordManagerSettingsBehaviourChange.NotActive";
-
 const char kBrandingExperimentName[] = "PasswordBranding";
 const char kSmartLockBrandingGroupName[] = "SmartLockBranding";
 const char kSmartLockNoBrandingGroupName[] = "NoSmartLockBranding";
@@ -61,12 +54,6 @@ class ManagePasswordsViewUtilDesktopTest : public testing::Test {
         kPasswordManagerSettingMigrationFieldTrialName, name);
   }
 
-  void EnforcePasswordManagerSettingsBehaviourChangeExperiment(
-      const char* name) {
-    settings_behaviour_change_ = base::FieldTrialList::CreateFieldTrial(
-        kPasswordManagerSettingsBehaviourChangeFieldTrialName, name);
-  }
-
   void EnforceSmartLockBrandingExperiment(const char* name) {
     smart_lock_branding_ =
         base::FieldTrialList::CreateFieldTrial(kBrandingExperimentName, name);
@@ -99,7 +86,6 @@ class ManagePasswordsViewUtilDesktopTest : public testing::Test {
   TestingProfile profile_;
   scoped_refptr<base::FieldTrial> smart_lock_branding_;
   scoped_refptr<base::FieldTrial> settings_migration_;
-  scoped_refptr<base::FieldTrial> settings_behaviour_change_;
 };
 
 TEST_F(ManagePasswordsViewUtilDesktopTest, GetPasswordManagerSettingsStringId) {
@@ -107,50 +93,30 @@ TEST_F(ManagePasswordsViewUtilDesktopTest, GetPasswordManagerSettingsStringId) {
     const char* description;
     const char* smart_lock_branding_experiment_group;
     const char* settings_migration_experiment_group;
-    const char* settings_behaviour_change_experiment_group;
     UserType user_type;
     int expected_setting_description_id;
   } kTestData[] = {
-      {"Smart Lock User, branding, behavioral change, migration active.",
+      {"Smart Lock User, branding, migration active",
        kSmartLockBrandingGroupName,
-       kEnabledPasswordManagerSettingsMigrationGroupName,
-       kPasswordManagerSettingsBehaviourChangeEnabledGroupName, SMART_LOCK_USER,
+       kEnabledPasswordManagerSettingsMigrationGroupName, SMART_LOCK_USER,
        IDS_OPTIONS_PASSWORD_MANAGER_SMART_LOCK_ENABLE},
-      {"Smart Lock User no branding, behavioral change, migration active.",
+      {"Smart Lock User, no branding, migration active",
        kSmartLockNoBrandingGroupName,
-       kEnabledPasswordManagerSettingsMigrationGroupName,
-       kPasswordManagerSettingsBehaviourChangeEnabledGroupName, SMART_LOCK_USER,
+       kEnabledPasswordManagerSettingsMigrationGroupName, SMART_LOCK_USER,
        IDS_OPTIONS_PASSWORD_MANAGER_SMART_LOCK_ENABLE},
-      {"Smart Lock User no branding, no behavioral change, migration active.",
+      {"Smart Lock User, no branding, no migration",
        kSmartLockNoBrandingGroupName,
-       kEnabledPasswordManagerSettingsMigrationGroupName,
-       kPasswordManagerSettingsBehaviourChangeDisabledGroupName,
-       SMART_LOCK_USER, IDS_OPTIONS_PASSWORD_MANAGER_SMART_LOCK_ENABLE},
-      {"Smart Lock User no branding, no behavioral change, no migration",
-       kSmartLockNoBrandingGroupName,
-       kDisablePasswordManagerSettingsMigrationGroupName,
-       kPasswordManagerSettingsBehaviourChangeDisabledGroupName,
-       SMART_LOCK_USER, IDS_OPTIONS_PASSWORD_MANAGER_ENABLE},
-      {"Smart Lock User branding, no behavioral change, no migration",
-       kSmartLockBrandingGroupName,
-       kDisablePasswordManagerSettingsMigrationGroupName,
-       kPasswordManagerSettingsBehaviourChangeDisabledGroupName,
-       SMART_LOCK_USER, IDS_OPTIONS_PASSWORD_MANAGER_SMART_LOCK_ENABLE},
-      {"Non Smart Lock User, no behavioral change, no migration",
-       kSmartLockNoBrandingGroupName,
-       kDisablePasswordManagerSettingsMigrationGroupName,
-       kPasswordManagerSettingsBehaviourChangeDisabledGroupName,
-       NON_SMART_LOCK_USER, IDS_OPTIONS_PASSWORD_MANAGER_ENABLE},
-      {"Non Smart Lock User, no behavioral change, migration",
-       kSmartLockNoBrandingGroupName,
-       kEnabledPasswordManagerSettingsMigrationGroupName,
-       kPasswordManagerSettingsBehaviourChangeDisabledGroupName,
-       NON_SMART_LOCK_USER, IDS_OPTIONS_PASSWORD_MANAGER_ENABLE},
-      {"Non Smart Lock User, behavioral change, migration",
-       kSmartLockNoBrandingGroupName,
-       kEnabledPasswordManagerSettingsMigrationGroupName,
-       kPasswordManagerSettingsBehaviourChangeEnabledGroupName,
-       NON_SMART_LOCK_USER, IDS_OPTIONS_PASSWORD_MANAGER_ENABLE},
+       kDisablePasswordManagerSettingsMigrationGroupName, SMART_LOCK_USER,
+       IDS_OPTIONS_PASSWORD_MANAGER_ENABLE},
+      {"Smart Lock User, branding, no migration", kSmartLockBrandingGroupName,
+       kDisablePasswordManagerSettingsMigrationGroupName, SMART_LOCK_USER,
+       IDS_OPTIONS_PASSWORD_MANAGER_SMART_LOCK_ENABLE},
+      {"Non Smart Lock User, no migration", kSmartLockNoBrandingGroupName,
+       kDisablePasswordManagerSettingsMigrationGroupName, NON_SMART_LOCK_USER,
+       IDS_OPTIONS_PASSWORD_MANAGER_ENABLE},
+      {"Non Smart Lock User, migration", kSmartLockNoBrandingGroupName,
+       kEnabledPasswordManagerSettingsMigrationGroupName, NON_SMART_LOCK_USER,
+       IDS_OPTIONS_PASSWORD_MANAGER_ENABLE},
   };
 
   for (const auto& test_case : kTestData) {
@@ -166,8 +132,6 @@ TEST_F(ManagePasswordsViewUtilDesktopTest, GetPasswordManagerSettingsStringId) {
         test_case.smart_lock_branding_experiment_group);
     EnforcePasswordManagerSettingMigrationExperiment(
         test_case.settings_migration_experiment_group);
-    EnforcePasswordManagerSettingsBehaviourChangeExperiment(
-        test_case.settings_behaviour_change_experiment_group);
     EXPECT_EQ(
         l10n_util::GetStringUTF16(test_case.expected_setting_description_id),
         l10n_util::GetStringUTF16(