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

chrome/browser/sync/test/integration/search_engines_helper.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 "chrome/browser/sync/test/integration/search_engines_helper.h"
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/sync/test/integration/await_match_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 
 using sync_datatype_helper::test;
 
 namespace {
 
@@ skipping 127 matching lines @@
                << verifier_turl->keyword();
       return false;
     }
     if (!TURLsMatch(verifier_turl, other_turl))
       return false;
   }
 
   return true;
 }
 
-bool AwaitAllServicesMatch() {
-  AwaitMatchStatusChangeChecker checker(base::Bind(AllServicesMatch),
-                                        "All search engines match");
-  checker.Wait();
-  return !checker.TimedOut();
-}
-
 bool AllServicesMatch() {
   // Use 0 as the baseline.
   if (test()->use_verifier() && !ServiceMatchesVerifier(0)) {
     DVLOG(1) << "TemplateURLService 0 does not match verifier.";
     return false;
   }
 
   for (int it = 1; it < test()->num_clients(); ++it) {
     if (!ServicesMatch(0, it)) {
       DVLOG(1) << "TemplateURLService " << it << " does not match with "
@@ skipping 96 matching lines @@
 }
 
 bool HasSearchEngine(int profile_index, int seed) {
   TemplateURLService* service = GetServiceForBrowserContext(profile_index);
   base::string16 keyword(CreateKeyword(seed));
   TemplateURL* turl = service->GetTemplateURLForKeyword(keyword);
   return turl != nullptr;
 }
 
 }  // namespace search_engines_helper
+
+SearchEnginesMatchChecker::SearchEnginesMatchChecker()
+    : AwaitMatchStatusChangeChecker(
+          base::Bind(search_engines_helper::AllServicesMatch),
+          "All search engines match") {}