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

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

 // Copyright (c) 2012 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/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #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:
   TwoClientSearchEnginesSyncTest() : SyncTest(TWO_CLIENT) {}
   ~TwoClientSearchEnginesSyncTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientSearchEnginesSyncTest);
 };
 
 // TCM ID - 8898628.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, E2E_ENABLED(Add)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   // Note that a random seed is needed due to the E2E nature of the tests, and
   // the synced data persisting in the server across tests.
   int search_engine_seed = base::Time::Now().ToInternalValue();
   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));
 }
 
 // TCM ID - 8898660.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, E2E_ENABLED(Delete)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   // Note that a random seed is needed due to the E2E nature of the tests, and
   // the synced data persisting in the server across tests.
   int search_engine_seed = base::Time::Now().ToInternalValue();
   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));
 }
 
 // TCM ID - 8912240.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest,
                        E2E_ENABLED(AddMultiple)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   // Add a few entries.
   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.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, Duplicates) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   // Add two entries with the same Name and URL (but different keywords).
   // Note that we have to change the GUID of the duplicate.
   search_engines_helper::AddSearchEngine(0, 0);
   Profile* profile = sync_datatype_helper::test()->GetProfile(0);
   TemplateURLServiceFactory::GetForProfile(profile)->Add(
       search_engines_helper::CreateTestTemplateURL(profile, 0,
           ASCIIToUTF16("somethingelse"), "newguid"));
   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.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest,
                        E2E_ENABLED(UpdateKeyword)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   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.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, E2E_ENABLED(UpdateUrl)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   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.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest,
                        E2E_ENABLED(UpdateName)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   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.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, ConflictKeyword) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   DisableVerifier();
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   // Add a different search engine to each client, but make their keywords
   // conflict.
@@ skipping 36 matching lines @@
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 }
 
 // TCM ID - 8906436.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, DisableSync) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   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));
 
   ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 }
 
 // TCM ID - 8891809.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest,
                        E2E_ENABLED(SyncDefault)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   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
 // without putting the clients out of sync.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest,
                        E2E_ENABLED(DeleteSyncedDefault)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(search_engines_helper::AllServicesMatch());
 
   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());
 }