[Sync] Refactoring of sync integration test checkers to remove boilerplate await methods.

chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "chrome/browser/prefs/pref_service_syncable_util.h"
 #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"
 #include "components/prefs/pref_service.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/protocol/preference_specifics.pb.h"
 #include "components/sync/protocol/priority_preference_specifics.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/test/fake_server/unique_client_entity.h"
 #include "components/syncable_prefs/pref_service_syncable.h"
 #include "components/syncable_prefs/pref_service_syncable_observer.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #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;
 
 namespace {
 
 void InjectPreferenceValueToFakeServer(fake_server::FakeServer* fake_server,
                                        const std::string& name,
                                        bool value) {
   std::string serialized;
@@ skipping 69 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOnOnSyncOffOff) {
   ASSERT_TRUE(SetupClients());
   SetLocalPrefValues(true /* kCredentialsEnableService */,
                      true /* kPasswordManagerSavingEnabled */);
   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 */);
 }
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOnOnSyncOnOff) {
   ASSERT_TRUE(SetupClients());
   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 */);
 }
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOnOnSyncOffOn) {
   ASSERT_TRUE(SetupClients());
   SetLocalPrefValues(true /* kCredentialsEnableService */,
                      true /* kPasswordManagerSavingEnabled */);
   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 */);
 }
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOnOffSyncOnOn) {
   ASSERT_TRUE(SetupClients());
   SetLocalPrefValues(true /* kCredentialsEnableService */,
                      false /* kPasswordManagerSavingEnabled */);
   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 */);
 }
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOnOffSyncOnOff) {
   ASSERT_TRUE(SetupClients());
   SetLocalPrefValues(true /* kCredentialsEnableService */,
                      false /* kPasswordManagerSavingEnabled */);
   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 */);
 }
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOnOffSyncOffOn) {
   ASSERT_TRUE(SetupClients());
   SetLocalPrefValues(true /* kCredentialsEnableService */,
                      false /* kPasswordManagerSavingEnabled */);
   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 */);
 }
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOffOffSyncOffOn) {
   ASSERT_TRUE(SetupClients());
   SetLocalPrefValues(false /* kCredentialsEnableService */,
                      false /* kPasswordManagerSavingEnabled */);
   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 */);
 }
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOffOffSyncOnOff) {
   ASSERT_TRUE(SetupClients());
   SetLocalPrefValues(false /* kCredentialsEnableService */,
                      false /* kPasswordManagerSavingEnabled */);
   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 */);
 }
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOffOnSyncOffOn) {
   ASSERT_TRUE(SetupClients());
   SetLocalPrefValues(false /* kCredentialsEnableService */,
                      true /* kPasswordManagerSavingEnabled */);
   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 */);
 }
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOffOffSyncOffOff) {
   ASSERT_TRUE(SetupClients());
   SetLocalPrefValues(false /* kCredentialsEnableService */,
                      false /* kPasswordManagerSavingEnabled */);
   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 */);
 }
 
 IN_PROC_BROWSER_TEST_F(
     SingleClientPasswordManagerSettingMigratorServiceSyncTest,
     LocalOnOnSyncOnOn) {
   ASSERT_TRUE(SetupClients());
   SetLocalPrefValues(true /* kCredentialsEnableService */,
                      true /* kPasswordManagerSavingEnabled */);
   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 */);
 }