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

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

 // Copyright (c) 2011 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 "chrome/browser/sync/test/integration/await_match_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/extensions_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/browser_sync/profile_sync_service.h"
 #include "components/sync/test/fake_server/tombstone_entity.h"
 
 using extensions_helper::AllProfilesHaveSameExtensionsAsVerifier;
 using extensions_helper::DisableExtension;
 using extensions_helper::GetInstalledExtensions;
 using extensions_helper::InstallExtension;
 using extensions_helper::InstallExtensionForAllProfiles;
-using sync_integration_test_util::AwaitCommitActivityCompletion;
 
 class SingleClientExtensionsSyncTest : public SyncTest {
  public:
   SingleClientExtensionsSyncTest() : SyncTest(SINGLE_CLIENT) {}
 
   ~SingleClientExtensionsSyncTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SingleClientExtensionsSyncTest);
 };
 
 IN_PROC_BROWSER_TEST_F(SingleClientExtensionsSyncTest, StartWithNoExtensions) {
   ASSERT_TRUE(SetupSync());
-
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 IN_PROC_BROWSER_TEST_F(SingleClientExtensionsSyncTest,
                        StartWithSomeExtensions) {
   ASSERT_TRUE(SetupClients());
 
   const int kNumExtensions = 5;
   for (int i = 0; i < kNumExtensions; ++i) {
     InstallExtension(GetProfile(0), i);
     InstallExtension(verifier(), i);
   }
 
   ASSERT_TRUE(SetupSync());
-
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 IN_PROC_BROWSER_TEST_F(SingleClientExtensionsSyncTest, InstallSomeExtensions) {
   ASSERT_TRUE(SetupSync());
 
   const int kNumExtensions = 5;
   for (int i = 0; i < kNumExtensions; ++i) {
     InstallExtension(GetProfile(0), i);
     InstallExtension(verifier(), i);
   }
 
-  ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));
-
+  ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 // Helper function for waiting to see the extension count in a profile
 // become a specific number.
 static bool ExtensionCountCheck(Profile* profile, size_t expected_count) {
   return GetInstalledExtensions(profile).size() == expected_count;
 }
 
 // Tests the case of an uninstall from the server conflicting with a local
@@ skipping 24 matching lines @@
   // and get uninstalled locally.
   const syncer::ModelTypeSet kExtensionsType(syncer::EXTENSIONS);
   TriggerSyncForModelTypes(0, kExtensionsType);
   server_extensions =
       GetFakeServer()->GetSyncEntitiesByModelType(syncer::EXTENSIONS);
   EXPECT_EQ(0ul, server_extensions.size());
 
   AwaitMatchStatusChangeChecker checker(
       base::Bind(&ExtensionCountCheck, GetProfile(0), 0u),
       "Waiting for profile to have no extensions");
-  checker.Wait();
-  EXPECT_TRUE(!checker.TimedOut());
+  EXPECT_TRUE(checker.Wait());
   EXPECT_TRUE(GetInstalledExtensions(GetProfile(0)).empty());
 }