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

chrome/browser/sync/test/integration/two_client_sessions_sync_test.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 <string>
 
 #include "base/guid.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sync/test/integration/passwords_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sessions_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/sync/engine/cycle/sync_cycle_snapshot.h"
 
-using sessions_helper::AwaitCheckForeignSessionsAgainst;
 using sessions_helper::CheckInitialState;
 using sessions_helper::DeleteForeignSession;
 using sessions_helper::GetLocalWindows;
 using sessions_helper::GetSessionData;
 using sessions_helper::OpenTabAndGetLocalWindows;
 using sessions_helper::ScopedWindowMap;
 using sessions_helper::SessionWindowMap;
 using sessions_helper::SyncedSessionVector;
 using sessions_helper::WindowsMatch;
 
@@ skipping 35 matching lines @@
   ScopedWindowMap client0_windows;
   std::string url = base::StringPrintf("http://127.0.0.1/bubba%s",
       base::GenerateGUID().c_str());
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(url), &client0_windows));
 
   // Retain the window information on client 0
   std::vector<ScopedWindowMap> expected_windows(1);
   expected_windows[0] = std::move(client0_windows);
 
   // Check the foreign windows on client 1
-  ASSERT_TRUE(AwaitCheckForeignSessionsAgainst(1, expected_windows));
+  ASSERT_TRUE(ForeignSessionsMatchChecker(1, expected_windows).Wait());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
                        E2E_ENABLED(MAYBE_AllChanged)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Open tabs on all clients and retain window information.
   std::vector<ScopedWindowMap> client_windows(num_clients());
   for (int i = 0; i < num_clients(); ++i) {
     ScopedWindowMap windows;
     std::string url = base::StringPrintf("http://127.0.0.1/bubba%s",
         base::GenerateGUID().c_str());
     ASSERT_TRUE(OpenTabAndGetLocalWindows(i, GURL(url), &windows));
     client_windows[i] = std::move(windows);
   }
 
   // Get foreign session data from all clients and check it against all
   // client_windows.
   for (int i = 0; i < num_clients(); ++i) {
-    ASSERT_TRUE(AwaitCheckForeignSessionsAgainst(i, client_windows));
+    ASSERT_TRUE(ForeignSessionsMatchChecker(i, client_windows).Wait());
   }
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
                        SingleClientEnabledEncryption) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));
   ASSERT_TRUE(CheckInitialState(1));
 
@@ skipping 120 matching lines @@
   ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
   ASSERT_FALSE(GetSessionData(1, &sessions1));
 
   // Client 0 becomes active again with a new tab.
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2), &client0_windows));
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(GetSessionData(1, &sessions1));
   ASSERT_EQ(1U, sessions1.size());
   ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, client0_windows));
 }