Enable ReconcileWhenWhenBothPrefsTypesArrivesFromSync on iOS

components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc

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 ce644d4a9a7bd95f94a178709d0a544c1671a200..c91203223d98aa95ac748128d678b08d3c613e35 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,19 +264,8 @@ 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,
-       MAYBE_ReconcileWhenWhenBothPrefsTypesArrivesFromSync) {
+       ReconcileWhenWhenBothPrefsTypesArrivesFromSync) {
   const struct {
     BooleanPrefState new_pref_local_value;
     BooleanPrefState old_pref_local_value;