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

chrome/browser/sync/test/integration/sessions_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/sessions_helper.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
-#include "chrome/browser/sync/test/integration/multi_client_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 "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/sync/driver/sync_client.h"
 #include "components/sync_sessions/open_tabs_ui_delegate.h"
 #include "content/public/test/test_utils.h"
 #include "url/gurl.h"
@@ skipping 336 matching lines @@
 
     if (s_index == sessions.size()) {
       LOG(ERROR) << "Cannot find window #" << w_index;
       return false;
     }
   }
 
   return true;
 }
 
-namespace {
+void DeleteForeignSession(int index, std::string session_tag) {
+  ProfileSyncServiceFactory::GetInstance()
+      ->GetForProfile(test()->GetProfile(index))
+      ->GetOpenTabsUIDelegate()
+      ->DeleteForeignSession(session_tag);
+}
 
-// Helper class used in the implementation of AwaitCheckForeignSessionsAgainst.
-class CheckForeignSessionsChecker : public MultiClientStatusChangeChecker {
- public:
-  CheckForeignSessionsChecker(int index,
-                              const std::vector<ScopedWindowMap>& windows);
-  ~CheckForeignSessionsChecker() override;
+}  // namespace sessions_helper
 
-  bool IsExitConditionSatisfied() override;
-  std::string GetDebugMessage() const override;
-
- private:
-  int index_;
-  const std::vector<ScopedWindowMap>& windows_;
-};
-
-CheckForeignSessionsChecker::CheckForeignSessionsChecker(
-    int index, const std::vector<ScopedWindowMap>& windows)
+ForeignSessionsMatchChecker::ForeignSessionsMatchChecker(
+    int index,
+    const std::vector<sessions_helper::ScopedWindowMap>& windows)
     : MultiClientStatusChangeChecker(
-        sync_datatype_helper::test()->GetSyncServices()),
+          sync_datatype_helper::test()->GetSyncServices()),
       index_(index),
       windows_(windows) {}
 
-CheckForeignSessionsChecker::~CheckForeignSessionsChecker() {}
-
-bool CheckForeignSessionsChecker::IsExitConditionSatisfied() {
-  return CheckForeignSessionsAgainst(index_, windows_);
+bool ForeignSessionsMatchChecker::IsExitConditionSatisfied() {
+  return sessions_helper::CheckForeignSessionsAgainst(index_, windows_);
 }
 
-std::string CheckForeignSessionsChecker::GetDebugMessage() const {
+std::string ForeignSessionsMatchChecker::GetDebugMessage() const {
   return "Waiting for matching foreign sessions";
 }
-
-}  //  namespace
-
-bool AwaitCheckForeignSessionsAgainst(
-    int index, const std::vector<ScopedWindowMap>& windows) {
-  CheckForeignSessionsChecker checker(index, windows);
-  checker.Wait();
-  return !checker.TimedOut();
-}
-
-void DeleteForeignSession(int index, std::string session_tag) {
-  ProfileSyncServiceFactory::GetInstance()->GetForProfile(
-      test()->GetProfile(index))->
-          GetOpenTabsUIDelegate()->DeleteForeignSession(session_tag);
-}
-
-}  // namespace sessions_helper