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

chrome/browser/sync/test/integration/typed_urls_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/typed_urls_helper.h"
 
 #include <stddef.h>
 
+#include <memory>
+
 #include "base/compiler_specific.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/test/integration/multi_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/history/core/browser/history_backend.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service.h"
 
 using sync_datatype_helper::test;
 
 namespace {
 
@@ skipping 128 matching lines @@
   wait_event.Wait();
 }
 
 // Creates a URLRow in the specified HistoryService with the passed transition
 // type.
 void AddToHistory(history::HistoryService* service,
                   const GURL& url,
                   ui::PageTransition transition,
                   history::VisitSource source,
                   const base::Time& timestamp) {
-  service->AddPage(url,
-                   timestamp,
-                   NULL, // scope
-                   1234, // nav_entry_id
+  service->AddPage(url, timestamp,
+                   NULL,    // scope
+                   1234,    // nav_entry_id
                    GURL(),  // referrer
-                   history::RedirectList(),
-                   transition,
-                   source,
-                   false);
+                   history::RedirectList(), transition, source, false);
 }
 
 history::URLRows GetTypedUrlsFromHistoryService(
     history::HistoryService* service) {
   base::CancelableTaskTracker tracker;
   history::URLRows rows;
   base::WaitableEvent wait_event(
       base::WaitableEvent::ResetPolicy::MANUAL,
       base::WaitableEvent::InitialState::NOT_SIGNALED);
   service->ScheduleDBTask(std::unique_ptr<history::HistoryDBTask>(
@@ skipping 230 matching lines @@
     golden_urls = GetTypedUrlsFromClient(0);
   }
   for (int i = 0; i < test()->num_clients(); ++i) {
     history::URLRows urls = GetTypedUrlsFromClient(i);
     if (!CheckURLRowVectorsAreEqual(golden_urls, urls))
       return false;
   }
   return true;
 }
 
-namespace {
-
-// Helper class used in the implementation of
-// AwaitCheckAllProfilesHaveSameURLs.
-class ProfilesHaveSameURLsChecker : public MultiClientStatusChangeChecker {
- public:
-  ProfilesHaveSameURLsChecker();
-  ~ProfilesHaveSameURLsChecker() override;
-
-  bool IsExitConditionSatisfied() override;
-  std::string GetDebugMessage() const override;
-};
+}  // namespace typed_urls_helper
 
 ProfilesHaveSameURLsChecker::ProfilesHaveSameURLsChecker()
     : MultiClientStatusChangeChecker(
         sync_datatype_helper::test()->GetSyncServices()) {}
 
-ProfilesHaveSameURLsChecker::~ProfilesHaveSameURLsChecker() {}
-
 bool ProfilesHaveSameURLsChecker::IsExitConditionSatisfied() {
-  return CheckAllProfilesHaveSameURLs();
+  return typed_urls_helper::CheckAllProfilesHaveSameURLs();
 }
 
 std::string ProfilesHaveSameURLsChecker::GetDebugMessage() const {
   return "Waiting for matching typed urls profiles";
 }
-
-}  //  namespace
-
-bool AwaitCheckAllProfilesHaveSameURLs() {
-  ProfilesHaveSameURLsChecker checker;
-  checker.Wait();
-  return !checker.TimedOut();
-}
-
-}  // namespace typed_urls_helper