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

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

Issue 1902113002: [Smart Lock] Fix settings reconciliation on ios. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/components_tests.gyp ('k') | no next file » | 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 889506b94c75d7227af64928eb5432fbb85e26bd..9701daddc8b90a602a23ca191e44e4ce0108531c 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
@@ -274,7 +274,7 @@ TEST_F(PasswordManagerSettingMigratorServiceTest,
PasswordManagerPreferencesInitialValues histogram_initial_value;
PasswordManagerPreferencesInitialAndFinalValues histogram_initial_and_final;
} kTestingTable[] = {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
{ON, OFF, ON, EMPTY, false, N1L0, I10F00},
{ON, OFF, OFF, EMPTY, false, N1L0, I10F00},
{ON, OFF, EMPTY, EMPTY, false, N1L0, I10F00},
@@ -330,7 +330,7 @@ TEST_F(PasswordManagerSettingMigratorServiceTest,
NotifyProfileAdded();
StartSyncingPref(prefs(), prefs::kCredentialsEnableService,
test_case.new_pref_sync_value);
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
StartSyncingPref(prefs(), prefs::kPasswordManagerSavingEnabled,
test_case.old_pref_sync_value);
#endif
@@ -356,7 +356,7 @@ TEST_F(PasswordManagerSettingMigratorServiceTest,
bool result_old_pref_value;
PasswordManagerPreferencesInitialValues histogram_initial_value;
} kTestingTable[] = {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
{ON, OFF, ON, EMPTY, true, false, N1L0},
{ON, OFF, OFF, EMPTY, false, false, N1L0},
{ON, OFF, EMPTY, EMPTY, true, false, N1L0},
@@ -410,7 +410,7 @@ TEST_F(PasswordManagerSettingMigratorServiceTest,
NotifyProfileAdded();
StartSyncingPref(prefs(), prefs::kCredentialsEnableService,
test_case.new_pref_sync_value);
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
StartSyncingPref(prefs(), prefs::kPasswordManagerSavingEnabled,
test_case.old_pref_sync_value);
#endif
« no previous file with comments | « components/components_tests.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698