Index: chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc |
diff --git a/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc b/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc |
index 113c81bb826e1d2e00c2284ef36df9d5851a9a29..a9238cb033e4470ee1e9ac84884f33520e4a5e41 100644 |
--- a/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc |
+++ b/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc |
@@ -8,8 +8,8 @@ |
#include "chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.h" |
#include "chrome/browser/sync/test/integration/preferences_helper.h" |
#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
-#include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
#include "chrome/browser/sync/test/integration/sync_test.h" |
+#include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h" |
#include "chrome/common/pref_names.h" |
#include "components/password_manager/core/common/password_manager_pref_names.h" |
#include "components/password_manager/sync/browser/password_manager_setting_migrator_service.h" |
@@ -27,9 +27,6 @@ |
#include "content/public/test/test_browser_thread_bundle.h" |
using password_manager_setting_migrater_helper::ExpectPrefValuesOnClient; |
-using preferences_helper::AwaitBooleanPrefMatches; |
-using preferences_helper::BooleanPrefMatches; |
-using preferences_helper::ChangeBooleanPref; |
using preferences_helper::GetPrefs; |
using password_manager::prefs::kCredentialsEnableService; |
using password_manager::prefs::kPasswordManagerSavingEnabled; |
@@ -119,8 +116,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(false /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(false /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
} |
@@ -132,8 +128,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(true /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(false /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
} |
@@ -147,8 +142,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(false /* kCredentialsEnableService */, |
true /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(false /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
} |
@@ -162,8 +156,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(true /* kCredentialsEnableService */, |
true /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(true /* kCredentialsEnableService */, |
true /* kPasswordManagerSavingEnabled */); |
} |
@@ -177,8 +170,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(true /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(false /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
} |
@@ -192,8 +184,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(false /* kCredentialsEnableService */, |
true /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(false /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
} |
@@ -207,8 +198,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(false /* kCredentialsEnableService */, |
true /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(true /* kCredentialsEnableService */, |
true /* kPasswordManagerSavingEnabled */); |
} |
@@ -222,8 +212,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(true /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(true /* kCredentialsEnableService */, |
true /* kPasswordManagerSavingEnabled */); |
} |
@@ -237,8 +226,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(false /* kCredentialsEnableService */, |
true /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(false /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
} |
@@ -252,8 +240,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(false /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(false /* kCredentialsEnableService */, |
false /* kPasswordManagerSavingEnabled */); |
} |
@@ -267,8 +254,7 @@ IN_PROC_BROWSER_TEST_F( |
InjectNewValues(true /* kCredentialsEnableService */, |
true /* kPasswordManagerSavingEnabled */); |
InitMigrationServiceAndSync(); |
- ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
- GetSyncService(0))); |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
AssertPrefValues(true /* kCredentialsEnableService */, |
true /* kPasswordManagerSavingEnabled */); |
} |