| Index: components/autofill/core/browser/personal_data_manager.cc
|
| diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc
|
| index 911d07b047e83d2ac6d69f1d03bf8669db355f20..fcc36877c7b07d9bad0ea6f0bd9334b81e52ef34 100644
|
| --- a/components/autofill/core/browser/personal_data_manager.cc
|
| +++ b/components/autofill/core/browser/personal_data_manager.cc
|
| @@ -675,8 +675,7 @@ const std::vector<CreditCard*>& PersonalDataManager::GetCreditCards() const {
|
| credit_cards_.clear();
|
| credit_cards_.insert(credit_cards_.end(), local_credit_cards_.begin(),
|
| local_credit_cards_.end());
|
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableWalletCardImport) &&
|
| + if (IsExperimentalWalletIntegrationEnabled() &&
|
| pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
|
| credit_cards_.insert(credit_cards_.end(), server_credit_cards_.begin(),
|
| server_credit_cards_.end());
|
| @@ -960,6 +959,13 @@ const std::string& PersonalDataManager::GetDefaultCountryCodeForNewAddress()
|
| return default_country_code_;
|
| }
|
|
|
| +bool PersonalDataManager::IsExperimentalWalletIntegrationEnabled() const {
|
| + // The feature can be enabled by sync experiment *or* command line flag.
|
| + return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableWalletCardImport) ||
|
| + pref_service_->GetBoolean(prefs::kAutofillWalletSyncExperimentEnabled);
|
| +}
|
| +
|
| void PersonalDataManager::SetProfiles(std::vector<AutofillProfile>* profiles) {
|
| if (is_off_the_record_)
|
| return;
|
|
|