| Index: chrome/browser/autofill/options_util.cc
|
| diff --git a/chrome/browser/autofill/options_util.cc b/chrome/browser/autofill/options_util.cc
|
| index 389d40e44beeee39ddb5f535469fe67f4b4c8a45..26d57f479615517cfc300b20491ec9857a6843e3 100644
|
| --- a/chrome/browser/autofill/options_util.cc
|
| +++ b/chrome/browser/autofill/options_util.cc
|
| @@ -4,39 +4,17 @@
|
|
|
| #include "chrome/browser/autofill/options_util.h"
|
|
|
| -#include "base/prefs/pref_service.h"
|
| #include "chrome/browser/autofill/personal_data_manager_factory.h"
|
| #include "chrome/browser/sync/profile_sync_service.h"
|
| #include "chrome/browser/sync/profile_sync_service_factory.h"
|
| -#include "components/autofill/core/browser/personal_data_manager.h"
|
| -#include "components/autofill/core/common/autofill_pref_names.h"
|
| +#include "components/autofill/core/browser/options_util.h"
|
|
|
| namespace autofill {
|
|
|
| bool WalletIntegrationAvailableForProfile(Profile* profile) {
|
| - ProfileSyncService* service =
|
| - ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);
|
| - if (!(service && service->IsSyncEnabledAndLoggedIn() &&
|
| - service->GetPreferredDataTypes().Has(syncer::AUTOFILL_PROFILE))) {
|
| - return false;
|
| - }
|
| -
|
| - PersonalDataManager* pdm = PersonalDataManagerFactory::GetForProfile(profile);
|
| - if (!pdm->IsExperimentalWalletIntegrationEnabled())
|
| - return false;
|
| -
|
| - // If the user is signed in and the feature is enabled, but no data is being
|
| - // synced, hide the option. The user doesn't have a Wallet account. If the
|
| - // feature is disabled, we can't know, so show the checkbox.
|
| - if (!profile->GetPrefs()->GetBoolean(prefs::kAutofillWalletImportEnabled))
|
| - return true;
|
| -
|
| - // If wallet is preferred but we haven't gotten the sync data yet, we don't
|
| - // know, so show the checkbox.
|
| - if (!service->GetActiveDataTypes().Has(syncer::AUTOFILL_WALLET_DATA))
|
| - return true;
|
| -
|
| - return pdm->HasServerData();
|
| + return WalletIntegrationAvailable(
|
| + ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile),
|
| + profile->GetPrefs(), PersonalDataManagerFactory::GetForProfile(profile));
|
| }
|
|
|
| } // namespace autofill
|
|
|