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

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

Index: chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc
index 667d23cc35592e41b467540d2f850c24289d26a8..812afd763b647a4496f106266dc1087597a604a8 100644
--- a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc
@@ -8,13 +8,12 @@
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/search_engines_helper.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.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 "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 
 using base::ASCIIToUTF16;
-using sync_integration_test_util::AwaitCommitActivityCompletion;
 
 class TwoClientSearchEnginesSyncTest : public SyncTest {
  public:
@@ -36,7 +35,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, E2E_ENABLED(Add)) {
   search_engines_helper::AddSearchEngine(0, search_engine_seed);
   ASSERT_TRUE(search_engines_helper::HasSearchEngine(0, search_engine_seed));
 
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
   ASSERT_TRUE(search_engines_helper::HasSearchEngine(1, search_engine_seed));
 }
 
@@ -51,12 +50,12 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, E2E_ENABLED(Delete)) {
   search_engines_helper::AddSearchEngine(0, search_engine_seed);
   ASSERT_TRUE(search_engines_helper::HasSearchEngine(0, search_engine_seed));
 
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
   ASSERT_TRUE(search_engines_helper::HasSearchEngine(1, search_engine_seed));
 
   search_engines_helper::DeleteSearchEngineBySeed(0, search_engine_seed);
 
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
   ASSERT_FALSE(search_engines_helper::HasSearchEngine(1, search_engine_seed));
 }
 
@@ -70,7 +69,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest,
   for (int i = 0; i < 3; ++i)
     search_engines_helper::AddSearchEngine(0, i);
 
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 }
 
 // TCM ID - 9011135.
@@ -88,7 +87,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, Duplicates) {
   search_engines_helper::GetVerifierService()->Add(
       search_engines_helper::CreateTestTemplateURL(profile, 0,
           ASCIIToUTF16("somethingelse"), "newguid"));
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 }
 
 // TCM ID - 9004201.
@@ -100,13 +99,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest,
   search_engines_helper::AddSearchEngine(0, 0);
 
   // Change the keyword.
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 
   search_engines_helper::EditSearchEngine(0, ASCIIToUTF16("test0"),
       ASCIIToUTF16("test0"), ASCIIToUTF16("newkeyword"),
       "http://www.test0.com/");
 
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 }
 
 // TCM ID - 8894859.
@@ -116,14 +115,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, E2E_ENABLED(UpdateUrl)) {
 
   search_engines_helper::AddSearchEngine(0, 0);
 
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 
   // Change the URL.
   search_engines_helper::EditSearchEngine(0, ASCIIToUTF16("test0"),
       ASCIIToUTF16("test0"), ASCIIToUTF16("test0"),
       "http://www.wikipedia.org/q=%s");
 
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 }
 
 // TCM ID - 8910490.
@@ -134,13 +133,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest,
 
   search_engines_helper::AddSearchEngine(0, 0);
 
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 
   // Change the short name.
   search_engines_helper::EditSearchEngine(0, ASCIIToUTF16("test0"),
       ASCIIToUTF16("New Name"), ASCIIToUTF16("test0"), "http://www.test0.com/");
 
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 }
 
 // TCM ID - 9004196.
@@ -197,7 +196,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, DisableSync) {
 
   ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
   search_engines_helper::AddSearchEngine(0, 0);
-  ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));
+  ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());
   ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0));
   ASSERT_FALSE(search_engines_helper::ServiceMatchesVerifier(1));
 
@@ -213,13 +212,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest,
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   search_engines_helper::AddSearchEngine(0, 0);
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 
   // Change the default to the new search engine, sync, and ensure that it
   // changed in the second client. AllServicesMatch does a default search
   // provider check.
   search_engines_helper::ChangeDefaultSearchProvider(0, 0);
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 }
 
 // Ensure that we can change the search engine and immediately delete it
@@ -231,13 +230,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest,
 
   search_engines_helper::AddSearchEngine(0, 0);
   search_engines_helper::AddSearchEngine(0, 1);
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 
   search_engines_helper::ChangeDefaultSearchProvider(0, 0);
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 
   // Change the default on the first client and delete the old default.
   search_engines_helper::ChangeDefaultSearchProvider(0, 1);
   search_engines_helper::DeleteSearchEngineBySeed(0, 0);
-  ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());
+  ASSERT_TRUE(SearchEnginesMatchChecker().Wait());
 }