Wallet on Android: Require initial Sync setup to be complete

Bug: 1113713
Change-Id: I60253242c830519186f9513caf4f93737c6f990f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2343025Reviewed-by: Jared Saul <jsaul@google.com>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796313}

components/autofill/core/browser/payments/autofill_wallet_model_type_controller.cc

@@ -8,10 +8,12 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "build/build_config.h"
 #include "components/autofill/core/common/autofill_prefs.h"
 #include "components/prefs/pref_service.h"
 #include "components/sync/driver/sync_auth_util.h"
 #include "components/sync/driver/sync_service.h"
+#include "components/sync/driver/sync_user_settings.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 namespace browser_sync {
@@ -87,6 +89,12 @@ AutofillWalletModelTypeController::GetPreconditionState() const {
           autofill::prefs::kAutofillWalletImportEnabled) &&
       pref_service_->GetBoolean(autofill::prefs::kAutofillCreditCardEnabled) &&
       !sync_service_->GetAuthError().IsPersistentError();
+#if defined(OS_ANDROID)
+  // On Android, it's also required that the initial Sync setup is complete
+  // (i.e. the user has previously opted in to Sync-the-feature, even if it's
+  // not enabled right now).
+  preconditions_met &= sync_service_->GetUserSettings()->IsFirstSetupComplete();
+#endif
   return preconditions_met ? PreconditionState::kPreconditionsMet
                            : PreconditionState::kMustStopAndClearData;
 }