Enable Pix by default

Remove field trial entry for Pix as well. The finch config will be
updated after this CL has landed.

Bug: 406504411
Change-Id: I867fffd7232bc1403e8b0c2939e008dd217d2c82
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6394313
Reviewed-by: Olivia Saul <jsaul@google.com>
Commit-Queue: Siddharth Shah <siashah@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1438420}

chrome/browser/facilitated_payments/ui/chrome_facilitated_payments_client_unittest.cc

@@ -84,42 +84,16 @@ TEST_F(ChromeFacilitatedPaymentsClientTest,
   base_client().ShowPixPaymentPrompt({}, base::DoNothing());
 }
 
-// Test that the `PIX_PAYMENT_MERCHANT_ALLOWLIST` optimization type is
-// registered when the `ChromeFacilitatedPaymentClient` is created.
-TEST_F(ChromeFacilitatedPaymentsClientTest, RegisterPixAllowlist) {
+// Test that the `EWALLET_MERCHANT_ALLOWLIST` and
+// `PIX_PAYMENT_MERCHANT_ALLOWLIST` optimization type is registered when the
+// `ChromeFacilitatedPaymentClient` is created.
+TEST_F(ChromeFacilitatedPaymentsClientTest, RegisterAllowlists) {
   base::test::ScopedFeatureList feature_list(
-      payments::facilitated::kEnablePixPayments);
+      payments::facilitated::kEwalletPayments);
   EXPECT_CALL(optimization_guide_decider_,
               RegisterOptimizationTypes(testing::ElementsAre(
                   optimization_guide::proto::PIX_MERCHANT_ORIGINS_ALLOWLIST)))
       .Times(1);
-
-  // Re-create the client; it should register the allowlist.
-  client_ = std::make_unique<ChromeFacilitatedPaymentsClient>(
-      web_contents(), &optimization_guide_decider_);
-}
-
-// Test that the `PIX_PAYMENT_MERCHANT_ALLOWLIST` optimization type is
-// not registered when the `ChromeFacilitatedPaymentClient` is created and the
-// Pix experiment is disabled.
-TEST_F(ChromeFacilitatedPaymentsClientTest, RegisterPixAllowlist_ExpOff) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndDisableFeature(payments::facilitated::kEnablePixPayments);
-  EXPECT_CALL(optimization_guide_decider_,
-              RegisterOptimizationTypes(testing::ElementsAre(
-                  optimization_guide::proto::PIX_MERCHANT_ORIGINS_ALLOWLIST)))
-      .Times(0);
-
-  // Re-create the client; it should not register the allowlist.
-  client_ = std::make_unique<ChromeFacilitatedPaymentsClient>(
-      web_contents(), &optimization_guide_decider_);
-}
-
-// Test that the `EWALLET_MERCHANT_ALLOWLIST` optimization type is
-// registered when the `ChromeFacilitatedPaymentClient` is created.
-TEST_F(ChromeFacilitatedPaymentsClientTest, RegisterEwalletAllowlist) {
-  base::test::ScopedFeatureList feature_list(
-      payments::facilitated::kEwalletPayments);
   EXPECT_CALL(optimization_guide_decider_,
               RegisterOptimizationTypes(testing::ElementsAre(
                   optimization_guide::proto::EWALLET_MERCHANT_ALLOWLIST)))
@@ -130,13 +104,17 @@ TEST_F(ChromeFacilitatedPaymentsClientTest, RegisterEwalletAllowlist) {
       web_contents(), &optimization_guide_decider_);
 }
 
-// Test that the `EWALLET_MERCHANT_ALLOWLIST` optimization type is
+// Test that the `EWALLET_MERCHANT_ALLOWLIST` optimization type is not
 // registered when when the `ChromeFacilitatedPaymentClient` is created and the
 // eWallet experiment is disabled.
-TEST_F(ChromeFacilitatedPaymentsClientTest, RegisterEwalletAllowlist_ExpOff) {
+TEST_F(ChromeFacilitatedPaymentsClientTest, RegisterAllowlists_EWalletExpOff) {
   base::test::ScopedFeatureList feature_list;
   feature_list.InitAndDisableFeature(payments::facilitated::kEwalletPayments);
 
+  EXPECT_CALL(optimization_guide_decider_,
+              RegisterOptimizationTypes(testing::ElementsAre(
+                  optimization_guide::proto::PIX_MERCHANT_ORIGINS_ALLOWLIST)))
+      .Times(1);
   EXPECT_CALL(optimization_guide_decider_,
               RegisterOptimizationTypes(testing::ElementsAre(
                   optimization_guide::proto::EWALLET_MERCHANT_ALLOWLIST)))

components/autofill/core/common/autofill_payments_features.cc

@@ -183,7 +183,7 @@ BASE_FEATURE(kAutofillEnableSaveAndFill,
 // stored in the local db.
 BASE_FEATURE(kAutofillEnableSyncingOfPixBankAccounts,
              "AutofillEnableSyncingOfPixBankAccounts",
-             base::FEATURE_DISABLED_BY_DEFAULT);
+             base::FEATURE_ENABLED_BY_DEFAULT);
 #endif  // BUILDFLAG(IS_ANDROID)
 
 // When enabled, Chrome will trigger 3DS authentication during a virtual card

components/facilitated_payments/core/features/features.cc

@@ -9,7 +9,7 @@ namespace payments::facilitated {
 // When enabled, Chrome will offer to pay with accounts supporting Pix.
 BASE_FEATURE(kEnablePixPayments,
              "EnablePixPayments",
-             base::FEATURE_DISABLED_BY_DEFAULT);
+             base::FEATURE_ENABLED_BY_DEFAULT);
 
 // When enabled, Chrome will offer to pay with accounts supporting Pix to users
 // using their devices in landscape mode. Chrome always offers to pay with Pix

testing/variations/fieldtrial_testing_config.json

@@ -9126,22 +9126,6 @@
             ]
         }
     ],
-    "EnablePixPayFlow": [
-        {
-            "platforms": [
-                "android"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "AutofillEnableSyncingOfPixBankAccounts",
-                        "EnablePixPayments"
-                    ]
-                }
-            ]
-        }
-    ],
     "EnablePkcs12ToChapsDualWrite": [
         {
             "platforms": [