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

chrome/browser/sync/test/integration/passwords_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_PASSWORDS_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_PASSWORDS_HELPER_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/memory/scoped_vector.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/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/browser_sync/profile_sync_service.h"
 
 namespace password_manager {
 class PasswordStore;
 }
 
 namespace passwords_helper {
 
@@ skipping 35 matching lines @@
 // password forms as the profile with index |index_b|.
 bool ProfilesContainSamePasswordForms(int index_a, int index_b);
 
 // Returns true iff all profiles contain the same password forms as the
 // verifier profile.
 bool AllProfilesContainSamePasswordFormsAsVerifier();
 
 // Returns true iff all profiles contain the same password forms.
 bool AllProfilesContainSamePasswordForms();
 
-// Returns true if all profiles contain the same password forms and
-// it doesn't time out.
-bool AwaitAllProfilesContainSamePasswordForms();
-
-// Returns true if specified profile contains the same password forms as the
-// verifier and it doesn't time out.
 bool AwaitProfileContainsSamePasswordFormsAsVerifier(int index);
 
 // Returns the number of forms in the password store of the profile with index
 // |index|.
 int GetPasswordCount(int index);
 
 // Returns the number of forms in the password store of the verifier profile.
 int GetVerifierPasswordCount();
 
 // Creates a test password form with a well known fake signon realm used only
 // by PasswordsSyncPerfTest based on |index|.
 autofill::PasswordForm CreateTestPasswordForm(int index);
 
 }  // namespace passwords_helper
 
+// Checker to block until all profiles contain the same password forms.
+class SamePasswordFormsChecker : public MultiClientStatusChangeChecker {
+ public:
+  SamePasswordFormsChecker();
+
+  // StatusChangeChecker implementation.
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
+
+ private:
+  bool in_progress_;
+  bool needs_recheck_;
+};
+
+// Checker to block until specified profile contains the same password forms as
+// the verifier.
+class SamePasswordFormsAsVerifierChecker
+    : public SingleClientStatusChangeChecker {
+ public:
+  explicit SamePasswordFormsAsVerifierChecker(int index);
+
+  // StatusChangeChecker implementation.
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
+
+ private:
+  int index_;
+  bool in_progress_;
+  bool needs_recheck_;
+};
+
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_PASSWORDS_HELPER_H_