[Autofill] Add field trial config for concurrent experiments.

This CL adds concurrent experiments for stable and beta to the field
trial configuration.

Change-Id: I83a0afef311d3df2f8881ce2684cf86847660372
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2452474
Commit-Queue: Matthias Körber <koerber@google.com>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814704}

chrome/browser/autofill/form_structure_browsertest.cc

@@ -159,7 +159,9 @@ FormStructureBrowserTest::FormStructureBrowserTest()
       {autofill::features::kAutofillEnforceMinRequiredFieldsForHeuristics,
        autofill::features::kAutofillEnforceMinRequiredFieldsForQuery,
        autofill::features::kAutofillEnforceMinRequiredFieldsForUpload,
-       autofill::features::kAutofillRestrictUnownedFieldsToFormlessCheckout});
+       autofill::features::kAutofillRestrictUnownedFieldsToFormlessCheckout,
+       autofill::features::
+           kAutofillUseParseCityStateCountryZipCodeInHeuristic});
 }
 
 FormStructureBrowserTest::~FormStructureBrowserTest() {}

testing/variations/fieldtrial_testing_config.json

@@ -700,6 +700,40 @@
             ]
         }
     ],
+    "AutofillConcurrentExperiments": [
+        {
+            "platforms": [
+                "android",
+                "chromeos",
+                "ios",
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "EnableAllImprovementsButNewSectioning",
+                    "enable_features": [
+                        "AutofillAllowHtmlTypeCountryCodesWithFullNames",
+                        "AutofillImportPrefilledCountryAndStateValues",
+                        "AutofillKeepCachedFormValues",
+                        "AutofillProfileImportFromUnfocusableFields",
+                        "AutofillProfileImportFromUnifiedSection",
+                        "AutofillRetrieveFromCacheWithRendererIds",
+                        "AutofillUsePageLanguageToTranslateCountryNames",
+                        "AutofillUseParseCityStateCountryZipCodeInHeuristic",
+                        "AutofillUseVariationCountryCode"
+                    ]
+                },
+                {
+                    "name": "EnableNewSectioning",
+                    "enable_features": [
+                        "AutofillSectionUponRedundantNameInfo"
+                    ]
+                }
+            ]
+        }
+    ],
     "AutofillCreditCardAuthentication": [
         {
             "platforms": [
@@ -1025,27 +1059,6 @@
             ]
         }
     ],
-    "AutofillUseVariationCountryCode": [
-        {
-            "platforms": [
-                "android",
-                "android_weblayer",
-                "chromeos",
-                "ios",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "AutofillUseVariationCountryCode"
-                    ]
-                }
-            ]
-        }
-    ],
     "BackForwardCache": [
         {
             "platforms": [