| Index: components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
|
| diff --git a/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc b/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
|
| index 7079598836cd9d4c9d14ec660ea8a92ccf29567b..78b788f2a5d43f8dd5cf0cb1b683de4c3324c60b 100644
|
| --- a/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
|
| +++ b/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
|
| @@ -264,8 +264,19 @@ TEST_F(PasswordManagerSettingMigratorServiceTest, TestMigrationOnLocalChanges) {
|
| }
|
| }
|
|
|
| +// TODO(crbug.com/604721): original CL never compiled this file with gyp and
|
| +// thus the test was never run on iOS and is now failing. Disabled until the
|
| +// bug is fixed to unblock conversion to gn.
|
| +#if !defined(OS_IOS)
|
| +#define MAYBE_ReconcileWhenWhenBothPrefsTypesArrivesFromSync \
|
| + ReconcileWhenWhenBothPrefsTypesArrivesFromSync
|
| +#else
|
| +#define MAYBE_ReconcileWhenWhenBothPrefsTypesArrivesFromSync \
|
| + DISABLED_ReconcileWhenWhenBothPrefsTypesArrivesFromSync
|
| +#endif
|
| +
|
| TEST_F(PasswordManagerSettingMigratorServiceTest,
|
| - ReconcileWhenWhenBothPrefsTypesArrivesFromSync) {
|
| + MAYBE_ReconcileWhenWhenBothPrefsTypesArrivesFromSync) {
|
| const struct {
|
| BooleanPrefState new_pref_local_value;
|
| BooleanPrefState old_pref_local_value;
|
|
|