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

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

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SESSIONS_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SESSIONS_HELPER_H_
 
 #include <algorithm>
+#include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "chrome/browser/sync/test/integration/multi_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/sessions/core/session_types.h"
 #include "components/sync/syncable/nigori_util.h"
 #include "components/sync_sessions/synced_session.h"
 
 class GURL;
 
 namespace sessions_helper {
 
 using SyncedSessionVector = std::vector<const sync_sessions::SyncedSession*>;
@@ skipping 51 matching lines @@
 bool WindowsMatch(const SessionWindowMap& win1, const ScopedWindowMap& win2);
 
 // Retrieves the foreign sessions for a particular profile and compares them
 // with a reference SessionWindow list.
 // Returns true if the session windows of the foreign session matches the
 // reference.
 bool CheckForeignSessionsAgainst(
     int index,
     const std::vector<ScopedWindowMap>& windows);
 
-// Retrieves the foreign sessions for a particular profile and compares them
-// to the reference windows using CheckForeignSessionsAgains. Returns true if
-// they match and doesn't time out.
-bool AwaitCheckForeignSessionsAgainst(
-    int index, const std::vector<ScopedWindowMap>& windows);
-
 // Open a single tab and block until the session model associator is aware
 // of it. Returns true upon success, false otherwise.
 bool OpenTab(int index, const GURL& url);
 
 // Open multiple tabs and block until the session model associator is aware
 // of all of them.  Returns true on success, false on failure.
 bool OpenMultipleTabs(int index, const std::vector<GURL>& urls);
 
 // Wait for a session change to propagate to the model associator.  Will not
 // return until each url in |urls| has been found.
 bool WaitForTabsToLoad(int index, const std::vector<GURL>& urls);
 
 // Check if the session model associator's knows that the current open tab
 // has this url.
 bool ModelAssociatorHasTabWithUrl(int index, const GURL& url);
 
 // Stores a pointer to the local session for a given profile in |session|.
 // Returns true on success, false on failure.
 bool GetLocalSession(int index, const sync_sessions::SyncedSession** session);
 
 // Deletes the foreign session with tag |session_tag| from the profile specified
 // by |index|. This will affect all synced clients.
 // Note: We pass the session_tag in by value to ensure it's not a reference
 // to the session tag within the SyncedSession we plan to delete.
 void DeleteForeignSession(int index, std::string session_tag);
 
 }  // namespace sessions_helper
 
+// Checker to block until the foreign sessions for a particular profile matches
+// the reference windows.
+class CheckForeignSessionsChecker : public MultiClientStatusChangeChecker {

[maxbogue, 2016/09/30 16:27:55]

Shouldn't this be ForeignSessionsMatchChecker to follow the same pattern as all
the others?

[skym, 2016/09/30 17:43:21]

Done.

+ public:
+  CheckForeignSessionsChecker(
+      int index,
+      const std::vector<sessions_helper::ScopedWindowMap>& windows);
+
+  // StatusChangeChecker implementation.
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
+
+ private:
+  int index_;
+  const std::vector<sessions_helper::ScopedWindowMap>& windows_;
+};
+
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SESSIONS_HELPER_H_