[Sticky Bubble] Enable feature on ToT

Approval @ crbug.com/1123804

This also puts some to-be-deprecated tests under flag protection.
Those along with the experiment branching logic will be cleaned up
later

Bug: 1070799
Change-Id: I24b35699a2f0e76ccf12467759fa8583534602ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2600041Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Matthias Körber <koerber@google.com>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845450}

chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl_unittest.cc

@@ -183,7 +183,27 @@ TEST_F(LocalCardMigrationBubbleControllerImplTest,
       AutofillMetrics::LOCAL_CARD_MIGRATION_BUBBLE_CLOSED_DENIED, 1);
 }
 
-TEST_F(LocalCardMigrationBubbleControllerImplTest,
+// TODO(siyua): Remove in experiment clean-up.
+// Test class to ensure the local card migration bubble navigation is logged
+// correctly.
+class LocalCardMigrationBubbleControllerImplTestWithoutStickyBubble
+    : public LocalCardMigrationBubbleControllerImplTest {
+ public:
+  LocalCardMigrationBubbleControllerImplTestWithoutStickyBubble() {
+    scoped_feature_list_.InitWithFeatures(
+        /*enabled_features=*/{},
+        /*disabled_features=*/{
+            features::kAutofillEnableFixedPaymentsBubbleLogging,
+            features::kAutofillEnableStickyPaymentsBubble});
+  }
+  ~LocalCardMigrationBubbleControllerImplTestWithoutStickyBubble() override =
+      default;
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
+};
+
+TEST_F(LocalCardMigrationBubbleControllerImplTestWithoutStickyBubble,
        Metrics_FirstShow_NavigateWhileShowing) {
   ShowBubble();
 
@@ -207,7 +227,7 @@ TEST_F(LocalCardMigrationBubbleControllerImplTest,
       1);
 }
 
-TEST_F(LocalCardMigrationBubbleControllerImplTest,
+TEST_F(LocalCardMigrationBubbleControllerImplTestWithoutStickyBubble,
        Metrics_Reshows_NavigateWhileShowing) {
   ShowBubble();
   CloseAndReshowBubble();
@@ -232,7 +252,7 @@ TEST_F(LocalCardMigrationBubbleControllerImplTest,
       1);
 }
 
-TEST_F(LocalCardMigrationBubbleControllerImplTest,
+TEST_F(LocalCardMigrationBubbleControllerImplTestWithoutStickyBubble,
        Metrics_FirstShow_NavigateWhileHidden) {
   ShowBubble();
 
@@ -249,7 +269,7 @@ TEST_F(LocalCardMigrationBubbleControllerImplTest,
       1);
 }
 
-TEST_F(LocalCardMigrationBubbleControllerImplTest,
+TEST_F(LocalCardMigrationBubbleControllerImplTestWithoutStickyBubble,
        Metrics_Reshows_NavigateWhileHidden) {
   ShowBubble();
   CloseAndReshowBubble();

components/autofill/core/common/autofill_payments_features.cc

@@ -59,7 +59,7 @@ const base::Feature kAutofillDownstreamCvcPromptUseGooglePayLogo{
 // 'accepted', 'cancelled', 'closed', 'not interacted' or 'lost focus'.
 const base::Feature kAutofillEnableFixedPaymentsBubbleLogging{
     "AutofillEnableFixedPaymentsBubbleLogging",
-    base::FEATURE_DISABLED_BY_DEFAULT};
+    base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Controls whether we show a Google-issued card in the suggestions list.
 const base::Feature kAutofillEnableGoogleIssuedCard{
@@ -85,7 +85,7 @@ const base::Feature kAutofillEnableSaveCardInfoBarAccountIndicationFooter{
 // When enabled, all payments related bubbles will not be dismissed upon page
 // navigation.
 const base::Feature kAutofillEnableStickyPaymentsBubble{
-    "AutofillEnableStickyPaymentsBubble", base::FEATURE_DISABLED_BY_DEFAULT};
+    "AutofillEnableStickyPaymentsBubble", base::FEATURE_ENABLED_BY_DEFAULT};
 
 // When enabled, Autofill data related icons will be shown in the status
 // chip in toolbar along with the avatar toolbar button.

testing/variations/fieldtrial_testing_config.json

@@ -894,25 +894,6 @@
             ]
         }
     ],
-    "AutofillEnableStickyBubbleAndUpdatedLogging": [
-        {
-            "platforms": [
-                "chromeos",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "AutofillEnableFixedPaymentsBubbleLogging",
-                        "AutofillEnableStickyPaymentsBubble"
-                    ]
-                }
-            ]
-        }
-    ],
     "AutofillEnableSupportForMoreStructureInNames": [
         {
             "platforms": [