Merge separate issuer BNPL feature flags into one flag
This CL merges the finch flags `AutofillEnableBuyNowPayLaterForAffirm`
and `AutofillEnableBuyNowPayLaterForZip` into an
`AutofillEnableBuyNowPayLater` flag. After discussing with the server
team, we realized that we can just not sync up disabled BNPL issuers
from the server, and if all issuers are disabled, we can just turn off
the one BNPL finch flag. Thus, we only need one flag.
Bug: 356443046
Change-Id: I27c4e1e0b10941796fd8f53e922bc3438298c178
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6271325
Reviewed-by: Slobodan Pejic <slobodan@chromium.org>
Commit-Queue: Vinny Persky <vinnypersky@google.com>
Cr-Commit-Position: refs/heads/main@{#1421951}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index c5dfcfa..02c2e85a 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -11113,19 +11113,10 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS)
- {"autofill-enable-buy-now-pay-later-for-affirm",
- flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmName,
- flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmDescription,
- kOsDesktop,
- FEATURE_VALUE_TYPE(
- autofill::features::kAutofillEnableBuyNowPayLaterForAffirm)},
-
- {"autofill-enable-buy-now-pay-later-for-zip",
- flag_descriptions::kAutofillEnableBuyNowPayLaterForZipName,
- flag_descriptions::kAutofillEnableBuyNowPayLaterForZipDescription,
- kOsDesktop,
- FEATURE_VALUE_TYPE(
- autofill::features::kAutofillEnableBuyNowPayLaterForZip)},
+ {"autofill-enable-buy-now-pay-later",
+ flag_descriptions::kAutofillEnableBuyNowPayLaterName,
+ flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(autofill::features::kAutofillEnableBuyNowPayLater)},
{"autofill-enable-buy-now-pay-later-syncing",
flag_descriptions::kAutofillEnableBuyNowPayLaterSyncingName,
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 048b6d83..a83b74b9 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -571,12 +571,7 @@
"expiry_milestone": 145
},
{
- "name": "autofill-enable-buy-now-pay-later-for-affirm",
- "owners": ["vinnypersky@google.com", "payments-autofill-team@google.com"],
- "expiry_milestone": 145
- },
- {
- "name": "autofill-enable-buy-now-pay-later-for-zip",
+ "name": "autofill-enable-buy-now-pay-later",
"owners": ["vinnypersky@google.com", "payments-autofill-team@google.com"],
"expiry_milestone": 145
},
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 90dde8c7b..af8747d 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -553,17 +553,11 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS)
-const char kAutofillEnableBuyNowPayLaterForAffirmName[] =
- "Enable buy now pay later on Autofill for Affirm";
-const char kAutofillEnableBuyNowPayLaterForAffirmDescription[] =
- "When enabled, users will have the option to pay with buy now pay later "
- "with Affirm on specific merchant webpages.";
-
-const char kAutofillEnableBuyNowPayLaterForZipName[] =
- "Enable buy now pay later on Autofill for Zip";
-const char kAutofillEnableBuyNowPayLaterForZipDescription[] =
- "When enabled, users will have the option to pay with buy now pay later "
- "with Zip on specific merchant webpages.";
+const char kAutofillEnableBuyNowPayLaterName[] =
+ "Enable buy now pay later on Autofill";
+const char kAutofillEnableBuyNowPayLaterDescription[] =
+ "When enabled, users will have the option to pay with buy now pay later on "
+ "specific merchant webpages.";
const char kAutofillEnableBuyNowPayLaterSyncingName[] =
"Enable syncing buy now pay later user data.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 38f299e..efbc2bbe 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -349,11 +349,8 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS)
-extern const char kAutofillEnableBuyNowPayLaterForAffirmName[];
-extern const char kAutofillEnableBuyNowPayLaterForAffirmDescription[];
-
-extern const char kAutofillEnableBuyNowPayLaterForZipName[];
-extern const char kAutofillEnableBuyNowPayLaterForZipDescription[];
+extern const char kAutofillEnableBuyNowPayLaterName[];
+extern const char kAutofillEnableBuyNowPayLaterDescription[];
extern const char kAutofillEnableBuyNowPayLaterSyncingName[];
extern const char kAutofillEnableBuyNowPayLaterSyncingDescription[];
diff --git a/components/autofill/core/browser/payments/bnpl_manager.cc b/components/autofill/core/browser/payments/bnpl_manager.cc
index 59575053..1bc7b31a 100644
--- a/components/autofill/core/browser/payments/bnpl_manager.cc
+++ b/components/autofill/core/browser/payments/bnpl_manager.cc
@@ -27,21 +27,10 @@
// `bnpl_issuer`.
bool ShouldShowBnplOptionForIssuer(const BnplIssuer& bnpl_issuer,
uint64_t extracted_amount_in_micros) {
- // Check Affirm eligibility with currency set to USD.
- // For MVP, BNPL will only targeting to US users and support USD.
- if (bnpl_issuer.issuer_id() == kBnplAffirmIssuerId &&
- bnpl_issuer.IsEligibleAmount(extracted_amount_in_micros, "USD") &&
- base::FeatureList::IsEnabled(
- features::kAutofillEnableBuyNowPayLaterForAffirm)) {
- return true;
- }
-
- // Check Zip eligibility with currency set to USD.
- // For MVP, BNPL will only targeting to US users and support USD.
- if (bnpl_issuer.issuer_id() == kBnplZipIssuerId &&
- bnpl_issuer.IsEligibleAmount(extracted_amount_in_micros, "USD") &&
- base::FeatureList::IsEnabled(
- features::kAutofillEnableBuyNowPayLaterForZip)) {
+ // For MVP, BNPL will only target US users and support USD.
+ if (bnpl_issuer.IsEligibleAmount(extracted_amount_in_micros,
+ /*currency=*/"USD") &&
+ base::FeatureList::IsEnabled(features::kAutofillEnableBuyNowPayLater)) {
return true;
}
@@ -207,10 +196,7 @@
return !payments_autofill_client_->GetPaymentsDataManager()
.GetBnplIssuers()
.empty() &&
- (base::FeatureList::IsEnabled(
- features::kAutofillEnableBuyNowPayLaterForAffirm) ||
- base::FeatureList::IsEnabled(
- features::kAutofillEnableBuyNowPayLaterForZip));
+ base::FeatureList::IsEnabled(features::kAutofillEnableBuyNowPayLater);
}
} // namespace autofill::payments
diff --git a/components/autofill/core/browser/payments/bnpl_manager_unittest.cc b/components/autofill/core/browser/payments/bnpl_manager_unittest.cc
index 6d1c0a1..dece9ff 100644
--- a/components/autofill/core/browser/payments/bnpl_manager_unittest.cc
+++ b/components/autofill/core/browser/payments/bnpl_manager_unittest.cc
@@ -154,8 +154,7 @@
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip},
+ features::kAutofillEnableBuyNowPayLater},
/*disabled_features=*/{});
// Add one linked issuer and one unlinked issuer to payments data manager.
@@ -182,8 +181,7 @@
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip},
+ features::kAutofillEnableBuyNowPayLater},
/*disabled_features=*/{});
// Add one linked issuer and one unlinked issuer to payments data manager.
@@ -209,8 +207,7 @@
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip},
+ features::kAutofillEnableBuyNowPayLater},
/*disabled_features=*/{});
// Add one linked issuer and one unlinked issuer to payments data manager.
@@ -235,8 +232,7 @@
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip},
+ features::kAutofillEnableBuyNowPayLater},
/*disabled_features=*/{});
// Add one linked issuer and one unlinked issuer to payments data manager.
@@ -257,13 +253,12 @@
}
// Tests that update suggestions callback will not be called if the BNPL
-// issuer feature flags are disabled.
-TEST_F(BnplManagerTest, AddBnplSuggestion_BnplIssuerFeaturesDisabled) {
+// feature flag is disabled.
+TEST_F(BnplManagerTest, AddBnplSuggestion_BnplFeatureDisabled) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing},
- /*disabled_features=*/{features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip});
+ /*disabled_features=*/{features::kAutofillEnableBuyNowPayLater});
// Add one linked issuer and one unlinked issuer to payments data manager.
SetUpLinkedBnplIssuer(40, 1000, std::string(kBnplAffirmIssuerId), 1234);
@@ -287,8 +282,7 @@
TEST_F(BnplManagerTest, AddBnplSuggestion_BnplSyncFeatureDisabled) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
- /*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip},
+ /*enabled_features=*/{features::kAutofillEnableBuyNowPayLater},
/*disabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing});
// Add one linked issuer and one unlinked issuer to payments data manager.
@@ -308,71 +302,15 @@
bnpl_manager_->OnSuggestionsShown(suggestions, callback.Get());
}
-// Tests that update suggestions callback will not be called if all BNPL
-// feature flags are disabled.
-TEST_F(BnplManagerTest, AddBnplSuggestion_BnplAllFeaturesDisabled) {
- base::test::ScopedFeatureList scoped_feature_list;
- scoped_feature_list.InitWithFeatures(
- /*enabled_features=*/{},
- /*disabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip});
-
- // Add one linked issuer and one unlinked issuer to payments data manager.
- SetUpLinkedBnplIssuer(40, 1000, std::string(kBnplAffirmIssuerId), 1234);
- SetUpUnlinkedBnplIssuer(1000, 2000, std::string(kBnplZipIssuerId));
-
- std::vector<Suggestion> suggestions = {
- Suggestion(SuggestionType::kCreditCardEntry),
- Suggestion(SuggestionType::kManageCreditCard)};
- base::MockCallback<UpdateSuggestionsCallback> callback;
- EXPECT_CALL(callback, Run).Times(0);
-
- bnpl_manager_->NotifyOfSuggestionGeneration(
- AutofillSuggestionTriggerSource::kUnspecified);
- bnpl_manager_->OnAmountExtractionReturned(
- std::optional<uint64_t>{1'234'560'000ULL});
- bnpl_manager_->OnSuggestionsShown(suggestions, callback.Get());
-}
-
-// Tests that update suggestions callback will not be called if the extracted
-// amount is only supported by Affirm, but the feature flag for Affirm is not
-// enabled.
-TEST_F(BnplManagerTest,
- AddBnplSuggestion_AffirmDisabledZipEnabled_AmountSupportedByAffirm) {
- base::test::ScopedFeatureList scoped_feature_list;
- scoped_feature_list.InitWithFeatures(
- /*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForZip},
- /*disabled_features=*/{features::kAutofillEnableBuyNowPayLaterForAffirm});
-
- // Add one linked issuer and one unlinked issuer to payments data manager.
- SetUpLinkedBnplIssuer(40, 1000, std::string(kBnplAffirmIssuerId), 1234);
- SetUpUnlinkedBnplIssuer(1000, 2000, std::string(kBnplZipIssuerId));
-
- std::vector<Suggestion> suggestions = {
- Suggestion(SuggestionType::kCreditCardEntry),
- Suggestion(SuggestionType::kManageCreditCard)};
- base::MockCallback<UpdateSuggestionsCallback> callback;
- EXPECT_CALL(callback, Run).Times(0);
-
- bnpl_manager_->NotifyOfSuggestionGeneration(
- AutofillSuggestionTriggerSource::kUnspecified);
- bnpl_manager_->OnAmountExtractionReturned(
- std::optional<uint64_t>{50'000'000ULL});
- bnpl_manager_->OnSuggestionsShown(suggestions, callback.Get());
-}
-
// Tests that update suggestions callback will be called if the extracted
-// amount is only supported by Affirm, and the feature flag for Affirm is
+// amount is only supported by Affirm, and the feature flag for BNPL is
// enabled.
-TEST_F(BnplManagerTest,
- AddBnplSuggestion_AffirmEnabledZipDisabled_AmountSupportedByAffirm) {
+TEST_F(BnplManagerTest, AddBnplSuggestion_AmountSupportedByAffirm) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm},
- /*disabled_features=*/{features::kAutofillEnableBuyNowPayLaterForZip});
+ features::kAutofillEnableBuyNowPayLater},
+ /*disabled_features=*/{});
// Add one linked issuer and one unlinked issuer to payments data manager.
SetUpLinkedBnplIssuer(40, 1000, std::string(kBnplAffirmIssuerId), 1234);
@@ -391,42 +329,14 @@
bnpl_manager_->OnSuggestionsShown(suggestions, callback.Get());
}
-// Tests that update suggestions callback will not be called if the extracted
-// amount is only supported by Zip, but the feature flag for Zip is not enabled.
-TEST_F(BnplManagerTest,
- AddBnplSuggestion_ZipDisabledAffirmEnabled_AmountSupportedByZip) {
- base::test::ScopedFeatureList scoped_feature_list;
- scoped_feature_list.InitWithFeatures(
- /*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm},
- /*disabled_features=*/{features::kAutofillEnableBuyNowPayLaterForZip});
-
- // Add one linked issuer and one unlinked issuer to payments data manager.
- SetUpLinkedBnplIssuer(40, 1000, std::string(kBnplAffirmIssuerId), 1234);
- SetUpUnlinkedBnplIssuer(1000, 2000, std::string(kBnplZipIssuerId));
-
- std::vector<Suggestion> suggestions = {
- Suggestion(SuggestionType::kCreditCardEntry),
- Suggestion(SuggestionType::kManageCreditCard)};
- base::MockCallback<UpdateSuggestionsCallback> callback;
- EXPECT_CALL(callback, Run).Times(0);
-
- bnpl_manager_->NotifyOfSuggestionGeneration(
- AutofillSuggestionTriggerSource::kUnspecified);
- bnpl_manager_->OnAmountExtractionReturned(
- std::optional<uint64_t>{1'234'560'000ULL});
- bnpl_manager_->OnSuggestionsShown(suggestions, callback.Get());
-}
-
// Tests that update suggestions callback will be called if the extracted
-// amount is only supported by Zip, and the feature flag for Zip is enabled.
-TEST_F(BnplManagerTest,
- AddBnplSuggestion_ZipEnabledAffirmDisabled_AmountSupportedByZip) {
+// amount is only supported by Zip, and the feature flag for BNPL is enabled.
+TEST_F(BnplManagerTest, AddBnplSuggestion_AmountSupportedByZip) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForZip},
- /*disabled_features=*/{features::kAutofillEnableBuyNowPayLaterForAffirm});
+ features::kAutofillEnableBuyNowPayLater},
+ /*disabled_features=*/{});
// Add one linked issuer and one unlinked issuer to payments data manager.
SetUpLinkedBnplIssuer(40, 1000, std::string(kBnplAffirmIssuerId), 1234);
@@ -447,12 +357,11 @@
// Tests that BNPL settings toggle should not be shown if all BNPL
// feature flags are disabled.
-TEST_F(BnplManagerTest, BnplSettingsToggleNotShown_BnplAllFeaturesDisabled) {
+TEST_F(BnplManagerTest, BnplSettingsToggleNotShown_BnplFeatureDisabled) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip},
+ features::kAutofillEnableBuyNowPayLater},
/*disabled_features=*/{});
// Add one linked issuer and one unlinked issuer to payments data manager.
@@ -465,8 +374,7 @@
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{},
/*disabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip});
+ features::kAutofillEnableBuyNowPayLater});
EXPECT_FALSE(bnpl_manager_->ShouldShowBnplSettingsToggle());
}
@@ -477,8 +385,7 @@
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip},
+ features::kAutofillEnableBuyNowPayLater},
/*disabled_features=*/{});
// Add one linked issuer and one unlinked issuer to payments data manager.
@@ -489,8 +396,7 @@
scoped_feature_list.Reset();
scoped_feature_list.InitWithFeatures(
- /*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip},
+ /*enabled_features=*/{features::kAutofillEnableBuyNowPayLater},
/*disabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing});
EXPECT_FALSE(bnpl_manager_->ShouldShowBnplSettingsToggle());
@@ -502,8 +408,7 @@
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip},
+ features::kAutofillEnableBuyNowPayLater},
/*disabled_features=*/{});
// Add one linked issuer and one unlinked issuer to payments data manager.
@@ -515,8 +420,7 @@
scoped_feature_list.Reset();
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing},
- /*disabled_features=*/{features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip});
+ /*disabled_features=*/{features::kAutofillEnableBuyNowPayLater});
EXPECT_FALSE(bnpl_manager_->ShouldShowBnplSettingsToggle());
}
@@ -527,8 +431,7 @@
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
/*enabled_features=*/{features::kAutofillEnableBuyNowPayLaterSyncing,
- features::kAutofillEnableBuyNowPayLaterForAffirm,
- features::kAutofillEnableBuyNowPayLaterForZip},
+ features::kAutofillEnableBuyNowPayLater},
/*disabled_features=*/{});
EXPECT_FALSE(bnpl_manager_->ShouldShowBnplSettingsToggle());
}
diff --git a/components/autofill/core/common/autofill_payments_features.cc b/components/autofill/core/common/autofill_payments_features.cc
index 065cecd..fcb9ba3 100644
--- a/components/autofill/core/common/autofill_payments_features.cc
+++ b/components/autofill/core/common/autofill_payments_features.cc
@@ -31,16 +31,9 @@
"AutofillEnableAmountExtractionDesktop",
base::FEATURE_DISABLED_BY_DEFAULT);
-// When enabled, buy now pay later (BNPL) in Autofill will be offered through
-// Affirm.
-BASE_FEATURE(kAutofillEnableBuyNowPayLaterForAffirm,
- "AutofillEnableBuyNowPayLaterForAffirm",
- base::FEATURE_DISABLED_BY_DEFAULT);
-
-// When enabled, buy now pay later (BNPL) in Autofill will be offered through
-// Zip.
-BASE_FEATURE(kAutofillEnableBuyNowPayLaterForZip,
- "AutofillEnableBuyNowPayLaterForZip",
+// When enabled, buy now pay later (BNPL) in Autofill will be offered.
+BASE_FEATURE(kAutofillEnableBuyNowPayLater,
+ "AutofillEnableBuyNowPayLater",
base::FEATURE_DISABLED_BY_DEFAULT);
// When enabled, buy now pay later (BNPL) data will be synced to Chrome clients.
diff --git a/components/autofill/core/common/autofill_payments_features.h b/components/autofill/core/common/autofill_payments_features.h
index 7f24780..b57eaef1 100644
--- a/components/autofill/core/common/autofill_payments_features.h
+++ b/components/autofill/core/common/autofill_payments_features.h
@@ -22,9 +22,7 @@
COMPONENT_EXPORT(AUTOFILL)
BASE_DECLARE_FEATURE(kAutofillEnableAmountExtractionDesktop);
COMPONENT_EXPORT(AUTOFILL)
-BASE_DECLARE_FEATURE(kAutofillEnableBuyNowPayLaterForAffirm);
-COMPONENT_EXPORT(AUTOFILL)
-BASE_DECLARE_FEATURE(kAutofillEnableBuyNowPayLaterForZip);
+BASE_DECLARE_FEATURE(kAutofillEnableBuyNowPayLater);
COMPONENT_EXPORT(AUTOFILL)
BASE_DECLARE_FEATURE(kAutofillEnableBuyNowPayLaterSyncing);
COMPONENT_EXPORT(AUTOFILL)
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index ab5eb3f..d5d4ede 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -9952,6 +9952,7 @@
label="AutofillEnableUpdateVirtualCardEnrollment:disabled"/>
<int value="-1643224308"
label="OmniboxMostVisitedTilesTitleWrapAround:disabled"/>
+ <int value="-1642482834" label="AutofillEnableBuyNowPayLater:disabled"/>
<int value="-1641832607" label="DragToPinTabs:enabled"/>
<int value="-1641656402"
label="RTCDisallowPlanBOutsideDeprecationTrial:disabled"/>
@@ -10252,6 +10253,7 @@
<int value="-1535608870" label="JourneysLabel:enabled"/>
<int value="-1534970225" label="FilesArchivemount:disabled"/>
<int value="-1534702850" label="RenderPassDrawnRect:disabled"/>
+ <int value="-1533989961" label="AutofillEnableBuyNowPayLater:enabled"/>
<int value="-1533450851" label="EnablePerDeskZOrder:enabled"/>
<int value="-1533258008" label="CalculateNativeWinOcclusion:enabled"/>
<int value="-1532720464" label="WellKnownChangePassword:enabled"/>
