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

chrome/browser/sync/test/integration/search_engines_helper.h

Index: chrome/browser/sync/test/integration/search_engines_helper.h
diff --git a/chrome/browser/sync/test/integration/search_engines_helper.h b/chrome/browser/sync/test/integration/search_engines_helper.h
index 86213be7c25bde765b6d4858c57e530b4e73f7d8..e8d5e627397d33977230e2c0bf1fed8d3ab23a12 100644
--- a/chrome/browser/sync/test/integration/search_engines_helper.h
+++ b/chrome/browser/sync/test/integration/search_engines_helper.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/strings/string16.h"
+#include "chrome/browser/sync/test/integration/await_match_status_change_checker.h"
 
 class Profile;
 class TemplateURL;
@@ -29,10 +30,6 @@ TemplateURLService* GetVerifierService();
 // Retrns true iff their user-visible fields match.
 bool ServiceMatchesVerifier(int profile_index);
 
-// Blocks until either AllServicesMatch returns true or a timeout occurs.
-// Returns true if AllServicesMatch succeeded, false if timeout.
-bool AwaitAllServicesMatch();
-
 // Returns true iff all TemplateURLServices match with the verifier.
 bool AllServicesMatch();
 
@@ -77,4 +74,10 @@ bool HasSearchEngine(int profile_index, int seed);
 
 }  // namespace search_engines_helper
 
+// Checker that blocks until all services have the same search engine data.
+class SearchEnginesMatchChecker : public AwaitMatchStatusChangeChecker {
+ public:
+  SearchEnginesMatchChecker();
+};
+
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SEARCH_ENGINES_HELPER_H_