[AF Wallet] Make AutofillWalletMetadataSizeChecker not timeout, take 2

The pervious CL 1563930 disregarded the fact the the initial Wait()
calls IsExitConditionSatisfied() directly without exercising
CheckExitCondition().

This Cl fixes that and implements the logic in
IsExitConditionSatisfied().

Bug: 921386
Change-Id: I8974c13cdba54a0579e41c865a44ed67efcb9ca7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1563995
Commit-Queue: Jan Krcal <jkrcal@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Auto-Submit: Jan Krcal <jkrcal@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649843}

chrome/browser/sync/test/integration/wallet_helper.cc

@@ -543,6 +543,40 @@ AutofillWalletMetadataSizeChecker::~AutofillWalletMetadataSizeChecker() {
 }
 
 bool AutofillWalletMetadataSizeChecker::IsExitConditionSatisfied() {
+  // Make sure we do not nest IsExitConditionSatisfiedImpl() (as it can happen
+  // that OnPersonalDataChanged() gets notified while we're inside
+  // IsExitConditionSatisfiedImpl(), waiting for the DB task that loads metadata
+  // to finish).
+  switch (state_) {
+    case IDLE:
+      do {
+        state_ = CHECKING;
+        if (IsExitConditionSatisfiedImpl()) {
+          return true;
+        }
+      } while (state_ == SHOULD_RECHECK);
+      state_ = IDLE;
+      return false;
+    case CHECKING:
+      // Make sure that each IsExitConditionSatisfied() call is followed by a
+      // IsExitConditionSatisfiedImpl() call so that we do not miss any updates
+      // to the DB.
+      state_ = SHOULD_RECHECK;
+      return false;
+    case SHOULD_RECHECK:
+      return false;
+  }
+}
+
+std::string AutofillWalletMetadataSizeChecker::GetDebugMessage() const {
+  return "Waiting for matching autofill wallet metadata sizes";
+}
+
+void AutofillWalletMetadataSizeChecker::OnPersonalDataChanged() {
+  CheckExitCondition();
+}
+
+bool AutofillWalletMetadataSizeChecker::IsExitConditionSatisfiedImpl() {
   // There could be trailing metadata left on one of the clients. Check that
   // metadata.size() is the same on both clients.
   std::map<std::string, AutofillMetadata> addresses_metadata_a =
@@ -568,39 +602,6 @@ bool AutofillWalletMetadataSizeChecker::IsExitConditionSatisfied() {
   return true;
 }
 
-std::string AutofillWalletMetadataSizeChecker::GetDebugMessage() const {
-  return "Waiting for matching autofill wallet metadata sizes";
-}
-
-void AutofillWalletMetadataSizeChecker::CheckExitCondition() {
-  // Make sure we do not nest IsExitConditionSatisfied() (as it can happen that
-  // OnPersonalDataChanged() gets notified while we're inside
-  // IsExitConditionSatisfied(), waiting for the DB task that loads metadata to
-  // finish).
-  switch (state_) {
-    case IDLE:
-      do {
-        state_ = CHECKING;
-        StatusChangeChecker::CheckExitCondition();
-      } while (state_ == SHOULD_RECHECK);
-      state_ = IDLE;
-      return;
-    case CHECKING:
-      // Make sure that each
-      // AutofillWalletMetadataSizeChecker::CheckExitCondition() call is
-      // followed by a StatusChangeChecker::CheckExitCondition() call so that we
-      // do not miss any updates to the DB.
-      state_ = SHOULD_RECHECK;
-      return;
-    case SHOULD_RECHECK:
-      return;
-  }
-}
-
-void AutofillWalletMetadataSizeChecker::OnPersonalDataChanged() {
-  CheckExitCondition();
-}
-
 UssWalletSwitchToggler::UssWalletSwitchToggler() {}
 
 void UssWalletSwitchToggler::InitWithDefaultFeatures() {

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

@@ -145,7 +145,6 @@ class AutofillWalletMetadataSizeChecker
 
   // StatusChangeChecker implementation.
   bool IsExitConditionSatisfied() override;
-  void CheckExitCondition() override;
   std::string GetDebugMessage() const override;
 
   // autofill::PersonalDataManager implementation.
@@ -154,6 +153,9 @@ class AutofillWalletMetadataSizeChecker
  private:
   // A state machine that makes sure we do not nest checking exit conditions.
   enum State { IDLE, CHECKING, SHOULD_RECHECK };
+
+  bool IsExitConditionSatisfiedImpl();
+
   State state_ = IDLE;
   const int profile_a_;
   const int profile_b_;