Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Unified Diff: components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc

Issue 1903443002: [GN/iOS] Explicitly list test data in //components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-fix-jingle
Patch Set: Address comments and disable non-fonctional test Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/password_manager/core/browser/BUILD.gn ('k') | components/security_state/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « components/password_manager/core/browser/BUILD.gn ('k') | components/security_state/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698