Add plus_address fieldtrial testing config

This change also includes a couple of explicit disablements in tests of an autofill change that will be run alongside plus_addresses for now. Change-Id: Ib7e89c7d2e654dbe734b6c3c73b96878a037f6f0 Bug: 1467623 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4978679 Commit-Queue: Matt Reichhoff <mreichhoff@chromium.org> Reviewed-by: Dominic Battre <battre@chromium.org> Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#1216673}
chromium · Oct 29, 2023 · d47ed2d · d47ed2d
1 parent fdb0fe2
commit d47ed2d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 8 deletions.
diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc
@@ -233,6 +233,10 @@ FormStructureBrowserTest::FormStructureBrowserTest()
        // TODO(crbug.com/1317961): Remove once launched. This feature is
        // disabled since it is not supported on iOS.
        features::kAutofillAlwaysParsePlaceholders,
+       // TODO(crbug.com/1493145): Remove when/if launched. This feature changes
+       // default parsing behavior, so must be disabled to avoid
+       // fieldtrial_testing_config interference.
+       features::kAutofillEnableEmailHeuristicOnlyAddressForms,
        // TODO(crbug.com/1427131): Remove once launched.
        blink::features::kAutofillUseDomNodeIdForRendererId});
 }

diff --git a/chrome/browser/webauthn/chrome_webauthn_autofill_interactive_uitest.cc b/chrome/browser/webauthn/chrome_webauthn_autofill_interactive_uitest.cc
@@ -26,6 +26,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/core/browser/ui/popup_item_ids.h"
 #include "components/autofill/core/browser/ui/popup_types.h"
+#include "components/autofill/core/common/autofill_features.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/network_session_configurator/common/network_switches.h"
 #include "components/password_manager/core/browser/password_store_interface.h"
@@ -157,7 +158,11 @@ class WebAuthnAutofillIntegrationTest : public CertVerifierBrowserTest {
   void SetUp() override {
     scoped_feature_list_.InitWithFeatures(
         {syncer::kSyncWebauthnCredentials, device::kWebAuthnNewPasskeyUI},
-        /*disabled_features=*/{});
+        /*disabled_features=*/{
+            // Disable this feature explicitly, as it can cause unexpected email
+            // fields to be parsed in these tests.
+            // TODO(crbug.com/1493145): Remove when/if launched.
+            autofill::features::kAutofillEnableEmailHeuristicOnlyAddressForms});
     ASSERT_TRUE(https_server_.InitializeAndListen());
 
     create_services_subscription_ =

diff --git a/ios/chrome/browser/autofill/form_structure_browsertest.mm b/ios/chrome/browser/autofill/form_structure_browsertest.mm
@@ -219,13 +219,19 @@
           features::kAutofillDefaultToCityAndNumber,
       },
       // Disabled
-      {// TODO(crbug.com/1311937): Remove once launched.
-       // This feature is part of the AutofillRefinedPhoneNumberTypes rollout.
-       // As it is not supported on iOS yet, it is disabled.
-       features::kAutofillConsiderPhoneNumberSeparatorsValidLabels,
-       // TODO(crbug.com/1317961): Remove once launched. This feature is
-       // disabled since it is not supported on iOS.
-       features::kAutofillAlwaysParsePlaceholders});
+      {
+          // TODO(crbug.com/1311937): Remove once launched.
+          // This feature is part of the AutofillRefinedPhoneNumberTypes
+          // rollout. As it is not supported on iOS yet, it is disabled.
+          features::kAutofillConsiderPhoneNumberSeparatorsValidLabels,
+          // TODO(crbug.com/1317961): Remove once launched. This feature is
+          // disabled since it is not supported on iOS.
+          features::kAutofillAlwaysParsePlaceholders,
+          // TODO(crbug.com/1493145): Remove when/if launched. This feature
+          // changes default parsing behavior, so must be disabled to avoid
+          // fieldtrial_testing_config interference.
+          features::kAutofillEnableEmailHeuristicOnlyAddressForms,
+      });
 }
 
 void FormStructureBrowserTest::SetUp() {

diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
@@ -12550,6 +12550,28 @@
             ]
         }
     ],
+    "PlusAddressExperiment": [
+        {
+            "platforms": [
+                "android",
+                "chromeos",
+                "chromeos_lacros",
+                "ios",
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "PlusAddressExperiment",
+                    "enable_features": [
+                        "AutofillEnableEmailHeuristicOnlyAddressForms",
+                        "PlusAddressesEnabled"
+                    ]
+                }
+            ]
+        }
+    ],
     "PopulateVisitedLinkDatabase": [
         {
             "platforms": [