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 b0b6ad526a51d07cc990bbc2b65f51ca823201cb..0c50d6733716c43292b578fb998026317457fc34 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,10 +31,6 @@ const char kPasswordManagerSettingMigrationFieldTrialName[] = |
const char kEnabledPasswordManagerSettingsMigrationGroupName[] = "Enable"; |
const char kDisablePasswordManagerSettingsMigrationGroupName[] = "Disable"; |
-const char kBrandingExperimentName[] = "PasswordBranding"; |
-const char kSmartLockBrandingGroupName[] = "SmartLockBranding"; |
-const char kSmartLockNoBrandingGroupName[] = "NoSmartLockBranding"; |
- |
} // namespace |
class ManagePasswordsViewUtilDesktopTest : public testing::Test { |
@@ -54,11 +50,6 @@ class ManagePasswordsViewUtilDesktopTest : public testing::Test { |
kPasswordManagerSettingMigrationFieldTrialName, name); |
} |
- void EnforceSmartLockBrandingExperiment(const char* name) { |
- smart_lock_branding_ = |
- base::FieldTrialList::CreateFieldTrial(kBrandingExperimentName, name); |
- } |
- |
browser_sync::ProfileSyncService* GetSyncServiceForSmartLockUser() { |
browser_sync::ProfileSyncServiceMock* sync_service = |
static_cast<browser_sync::ProfileSyncServiceMock*>( |
@@ -91,30 +82,20 @@ class ManagePasswordsViewUtilDesktopTest : public testing::Test { |
TEST_F(ManagePasswordsViewUtilDesktopTest, GetPasswordManagerSettingsStringId) { |
const struct { |
const char* description; |
- const char* smart_lock_branding_experiment_group; |
const char* settings_migration_experiment_group; |
UserType user_type; |
int expected_setting_description_id; |
} kTestData[] = { |
- {"Smart Lock User, branding, migration active", |
- kSmartLockBrandingGroupName, |
+ {"Smart Lock User, migration active", |
kEnabledPasswordManagerSettingsMigrationGroupName, SMART_LOCK_USER, |
IDS_OPTIONS_PASSWORD_MANAGER_SMART_LOCK_ENABLE}, |
- {"Smart Lock User, no branding, migration active", |
- kSmartLockNoBrandingGroupName, |
- kEnabledPasswordManagerSettingsMigrationGroupName, SMART_LOCK_USER, |
- IDS_OPTIONS_PASSWORD_MANAGER_SMART_LOCK_ENABLE}, |
- {"Smart Lock User, no branding, no migration", |
- kSmartLockNoBrandingGroupName, |
+ {"Smart Lock User, no migration", |
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, |
+ {"Non Smart Lock User, no migration", |
kDisablePasswordManagerSettingsMigrationGroupName, NON_SMART_LOCK_USER, |
IDS_OPTIONS_PASSWORD_MANAGER_ENABLE}, |
- {"Non Smart Lock User, migration", kSmartLockNoBrandingGroupName, |
+ {"Non Smart Lock User, migration", |
kEnabledPasswordManagerSettingsMigrationGroupName, NON_SMART_LOCK_USER, |
IDS_OPTIONS_PASSWORD_MANAGER_ENABLE}, |
}; |
@@ -128,8 +109,6 @@ TEST_F(ManagePasswordsViewUtilDesktopTest, GetPasswordManagerSettingsStringId) { |
sync_service = GetSyncServiceForSmartLockUser(); |
else |
sync_service = GetSyncServiceForNonSmartLockUser(); |
- EnforceSmartLockBrandingExperiment( |
- test_case.smart_lock_branding_experiment_group); |
EnforcePasswordManagerSettingMigrationExperiment( |
test_case.settings_migration_experiment_group); |
EXPECT_EQ( |