[Autofill Views] Turning two-line layout on-by-default

Change-Id: I3e13df1bb2c3a330ff535321fbad525f9755cf03
Bug: 870342
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1529406
Auto-Submit: Tommy Martino <[email protected]>
Commit-Queue: Fabio Tirelo <[email protected]>
Reviewed-by: Fabio Tirelo <[email protected]>
Cr-Commit-Position: refs/heads/master@{#644152}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 0cf1681..df8abdfd 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1011,26 +1011,6 @@
      {"kalman", kResamplingInputEventsKalmanEnabled,
       base::size(kResamplingInputEventsKalmanEnabled), nullptr}};
 
-#if !defined(OS_ANDROID)
-const FeatureEntry::FeatureParam kAutofillDropdownLayoutLeadingIcon[] = {
-    {autofill::kAutofillDropdownLayoutParameterName,
-     autofill::kAutofillDropdownLayoutParameterLeadingIcon}};
-const FeatureEntry::FeatureParam kAutofillDropdownLayoutTrailingIcon[] = {
-    {autofill::kAutofillDropdownLayoutParameterName,
-     autofill::kAutofillDropdownLayoutParameterTrailingIcon}};
-const FeatureEntry::FeatureParam kAutofillDropdownLayoutTwoLinesLeadingIcon[] =
-    {{autofill::kAutofillDropdownLayoutParameterName,
-      autofill::kAutofillDropdownLayoutParameterTwoLinesLeadingIcon}};
-
-const FeatureEntry::FeatureVariation kAutofillDropdownLayoutVariations[] = {
-    {"(leading icon)", kAutofillDropdownLayoutLeadingIcon,
-     base::size(kAutofillDropdownLayoutLeadingIcon), nullptr},
-    {"(trailing icon)", kAutofillDropdownLayoutTrailingIcon,
-     base::size(kAutofillDropdownLayoutLeadingIcon), nullptr},
-    {"(two line leading icon)", kAutofillDropdownLayoutTwoLinesLeadingIcon,
-     base::size(kAutofillDropdownLayoutTwoLinesLeadingIcon), nullptr}};
-#endif  // !defined(OS_ANDROID)
-
 #if defined(OS_ANDROID)
 const FeatureEntry::FeatureParam kBottomOfflineIndicatorEnabled[] = {
     {"bottom_offline_indicator", "true"}};
@@ -3668,9 +3648,7 @@
 #if !defined(OS_ANDROID)
     {"autofill-dropdown-layout", flag_descriptions::kAutofillDropdownLayoutName,
      flag_descriptions::kAutofillDropdownLayoutDescription, kOsDesktop,
-     FEATURE_WITH_PARAMS_VALUE_TYPE(autofill::kAutofillDropdownLayoutExperiment,
-                                    kAutofillDropdownLayoutVariations,
-                                    "AutofillDropdownLayout")},
+     FEATURE_VALUE_TYPE(autofill::kAutofillDropdownLayoutExperiment)},
 #endif  // OS_ANDROID
 
 #if defined(OS_CHROMEOS)