Clean up flag AutofillEnableSupportForAddressOverflow.

The feature was default enabled on M128. This CL cleans up the flag two
releases later.

Bug: 40275657
Change-Id: I60d60c6fd08a4661624201f0fc5dffd2a30235d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5803504
Reviewed-by: Jihad Hanna <jihadghanna@google.com>
Commit-Queue: Norge Vizcay <vizcay@google.com>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1345296}

android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java

@@ -282,9 +282,6 @@ public final class ProductionSupportedFlagList {
         Flag.baseFeature(
                 AutofillFeatures.AUTOFILL_ENABLE_SUPPORT_FOR_ADMIN_LEVEL2,
                 "When enabled, Autofill supports admin-level2 fields."),
-        Flag.baseFeature(
-                AutofillFeatures.AUTOFILL_ENABLE_SUPPORT_FOR_ADDRESS_OVERFLOW,
-                "When enabled, Autofill supports overflow fields."),
         Flag.baseFeature(
                 AutofillFeatures.AUTOFILL_ENABLE_PARSING_OF_STREET_LOCATION,
                 "When enabled, Autofill supports parsing fields as street locations."),

chrome/browser/autofill/autofill_server_browsertest.cc

@@ -123,7 +123,6 @@ class AutofillServerTest : public InProcessBrowserTest {
          features::kAutofillEnableSupportForBetweenStreets,
          features::kAutofillEnableSupportForAdminLevel2,
          features::kAutofillEnableSupportForApartmentNumbers,
-         features::kAutofillEnableSupportForAddressOverflow,
          features::kAutofillUseI18nAddressModel,
          features::kAutofillUseBRAddressModel,
          features::kAutofillUseCAAddressModel,

components/autofill/core/browser/crowdsourcing/determine_possible_field_types_unittest.cc

@@ -130,7 +130,6 @@ class ProfileMatchingTypesTest
         {features::kAutofillEnableSupportForBetweenStreets,
          features::kAutofillEnableSupportForAdminLevel2,
          features::kAutofillEnableSupportForApartmentNumbers,
-         features::kAutofillEnableSupportForAddressOverflow,
          features::kAutofillUseI18nAddressModel,
          features::kAutofillUseBRAddressModel,
          features::kAutofillUseCAAddressModel,

components/autofill/core/browser/data_model/address_unittest.cc

@@ -31,7 +31,6 @@ class AddressTest : public testing::Test {
             features::kAutofillEnableSupportForBetweenStreets,
             features::kAutofillEnableSupportForAdminLevel2,
             features::kAutofillEnableSupportForApartmentNumbers,
-            features::kAutofillEnableSupportForAddressOverflow,
             features::kAutofillUseAUAddressModel,
             features::kAutofillUseBRAddressModel,
             features::kAutofillUseCAAddressModel,

components/autofill/core/browser/data_model/autofill_profile_unittest.cc

@@ -1373,8 +1373,7 @@ TEST_F(AutofillProfileTest, Compare_StructuredTypes) {
        features::kAutofillUseMXAddressModel,
        features::kAutofillEnableSupportForBetweenStreets,
        features::kAutofillEnableSupportForAdminLevel2,
-       features::kAutofillEnableSupportForApartmentNumbers,
-       features::kAutofillEnableSupportForAddressOverflow},
+       features::kAutofillEnableSupportForApartmentNumbers},
       {});
   // Those types do store a verification status.
   FieldTypeSet structured_types{

components/autofill/core/browser/data_model/autofill_structured_address.cc

@@ -357,11 +357,9 @@ AdminLevel2Node::AdminLevel2Node(SubcomponentsList children)
 AdminLevel2Node::~AdminLevel2Node() = default;
 
 AddressOverflowNode::AddressOverflowNode(SubcomponentsList children)
-    : FeatureGuardedAddressComponent(
-          &features::kAutofillEnableSupportForAddressOverflow,
-          ADDRESS_HOME_OVERFLOW,
-          std::move(children),
-          MergeMode::kReplaceEmpty | kReplaceSubset) {}
+    : AddressComponent(ADDRESS_HOME_OVERFLOW,
+                       std::move(children),
+                       MergeMode::kReplaceEmpty | kReplaceSubset) {}
 
 AddressOverflowNode::~AddressOverflowNode() = default;
 

components/autofill/core/browser/data_model/autofill_structured_address.h

@@ -109,7 +109,7 @@ class AdminLevel2Node : public FeatureGuardedAddressComponent {
 // overflow fields, meaning that forms follow a consistent structure that is
 // typically identical across domains while also providing an option for an
 // overflow field.
-class AddressOverflowNode : public FeatureGuardedAddressComponent {
+class AddressOverflowNode : public AddressComponent {
  public:
   explicit AddressOverflowNode(SubcomponentsList children);
   ~AddressOverflowNode() override;

components/autofill/core/browser/data_model/autofill_structured_address_component_unittest.cc

@@ -232,7 +232,6 @@ class AutofillStructuredAddressAddressComponent : public testing::Test {
          features::kAutofillUseINAddressModel,
          features::kAutofillUseMXAddressModel,
          features::kAutofillEnableSupportForBetweenStreets,
-         features::kAutofillEnableSupportForAddressOverflow,
          features::kAutofillEnableSupportForAdminLevel2,
          features::kAutofillEnableSupportForApartmentNumbers},
         {});

components/autofill/core/browser/data_model/autofill_structured_address_unittest.cc

@@ -82,7 +82,6 @@ class AutofillStructuredAddress : public testing::Test {
         {features::kAutofillEnableSupportForBetweenStreets,
          features::kAutofillEnableSupportForAdminLevel2,
          features::kAutofillEnableSupportForApartmentNumbers,
-         features::kAutofillEnableSupportForAddressOverflow,
          features::kAutofillUseI18nAddressModel,
          features::kAutofillUseAUAddressModel,
          features::kAutofillUseBRAddressModel,

components/autofill/core/browser/form_data_importer_unittest.cc

@@ -535,7 +535,6 @@ class FormDataImporterTest : public testing::Test {
          features::kAutofillEnableSupportForApartmentNumbers,
          features::kAutofillEnableSupportForBetweenStreets,
          features::kAutofillEnableSupportForAdminLevel2,
-         features::kAutofillEnableSupportForAddressOverflow,
          features::kAutofillEnableParsingOfStreetLocation},
         {});
   }

components/autofill/core/browser/form_parsing/address_field_parser.cc

@@ -371,8 +371,6 @@ bool AddressFieldParser::ParseAddressFieldSequence(ParsingContext& context,
     // we don't want them both to be in the same form section. This would
     // probably point to some problem in the classification.
     if (!(overflow_and_landmark_ || overflow_) &&
-        base::FeatureList::IsEnabled(
-            features::kAutofillEnableSupportForAddressOverflow) &&
         i18n_model_definition::IsTypeEnabledForCountry(ADDRESS_HOME_OVERFLOW,
                                                        country_code) &&
         ParseField(context, scanner, overflow_patterns, &overflow_,
@@ -956,8 +954,6 @@ AddressFieldParser::ParseNameAndLabelForOverflow(ParsingContext& context,
   AddressCountryCode country_code(context.client_country.value());
   // TODO(crbug.com/40266693) Remove feature check when launched.
   if (overflow_and_landmark_ || overflow_ ||
-      !base::FeatureList::IsEnabled(
-          features::kAutofillEnableSupportForAddressOverflow) ||
       !i18n_model_definition::IsTypeEnabledForCountry(ADDRESS_HOME_OVERFLOW,
                                                       country_code)) {
     return RESULT_MATCH_NONE;

components/autofill/core/browser/form_parsing/address_field_parser_ng_unittest.cc

@@ -224,11 +224,7 @@ TEST_P(AddressFieldParserTestNG, ParseAdminLevel2) {
 // Tests that overflow field is correctly classified.
 TEST_P(AddressFieldParserTestNG, ParseOverflow) {
   // TODO(crbug.com/40266693): Remove once launched.
-  base::test::ScopedFeatureList enabled;
-  enabled.InitWithFeatures({features::kAutofillUseBRAddressModel,
-                            features::kAutofillEnableSupportForAddressOverflow},
-                           {});
-
+  base::test::ScopedFeatureList enabled{features::kAutofillUseBRAddressModel};
   AddTextFormFieldData("complemento", "Complemento", ADDRESS_HOME_OVERFLOW);
   ClassifyAndVerify(ParseResult::kParsed, GeoIpCountryCode("BR"),
                     LanguageCode("pt"));
@@ -237,13 +233,7 @@ TEST_P(AddressFieldParserTestNG, ParseOverflow) {
 // Tests that overflow field is correctly classified.
 TEST_P(AddressFieldParserTestNG, ParseOverflowAndLandmark) {
   // TODO(crbug.com/40266693): Remove once launched.
-  base::test::ScopedFeatureList features;
-  features.InitWithFeatures(
-      /*enabled_features=*/
-      {features::kAutofillUseBRAddressModel,
-       features::kAutofillEnableSupportForAddressOverflow},
-      /*disabled_features=*/{});
-
+  base::test::ScopedFeatureList features{features::kAutofillUseBRAddressModel};
   AddTextFormFieldData("additional_info", "Complemento e ponto de referência",
                        ADDRESS_HOME_OVERFLOW_AND_LANDMARK);
   ClassifyAndVerify(ParseResult::kParsed, GeoIpCountryCode("BR"),

components/autofill/core/browser/form_parsing/address_field_parser_unittest.cc

@@ -283,8 +283,7 @@ TEST_P(AddressFieldParserTest, ParseOverflow) {
       {"adresszusatz", "Adresszusatz", "DE", "de"},
   };
   base::test::ScopedFeatureList enabled;
-  enabled.InitWithFeatures({features::kAutofillEnableSupportForAddressOverflow,
-                            features::kAutofillUseBRAddressModel,
+  enabled.InitWithFeatures({features::kAutofillUseBRAddressModel,
                             features::kAutofillUseDEAddressModel},
                            {});
 
@@ -304,13 +303,7 @@ TEST_P(AddressFieldParserTest, ParseOverflow) {
 // Tests that overflow field is correctly classified.
 TEST_P(AddressFieldParserTest, ParseOverflowAndLandmark) {
   // TODO(crbug.com/40266693): Remove once launched.
-  base::test::ScopedFeatureList features;
-  features.InitWithFeatures(
-      /*enabled_features=*/
-      {features::kAutofillEnableSupportForAddressOverflow,
-       features::kAutofillUseBRAddressModel},
-      /*disabled_features=*/{});
-
+  base::test::ScopedFeatureList features{features::kAutofillUseBRAddressModel};
   AddTextFormFieldData("additional_info", "Complemento e ponto de referência",
                        ADDRESS_HOME_OVERFLOW_AND_LANDMARK);
   ClassifyAndVerify(ParseResult::kParsed, GeoIpCountryCode("BR"),
@@ -364,7 +357,6 @@ TEST_P(AddressFieldParserTest,
   base::test::ScopedFeatureList enabled;
   enabled.InitWithFeatures(
       {
-          features::kAutofillEnableSupportForAddressOverflow,
           features::kAutofillEnableSupportForBetweenStreets,
           features::kAutofillEnableSupportForAdminLevel2,
           features::kAutofillUseMXAddressModel,

components/autofill/core/browser/heuristic_classification_unittests.cc

@@ -558,7 +558,6 @@ TEST_P(HeuristicClassificationTests, EndToEnd) {
       features::kAutofillUsePLAddressModel,
       features::kAutofillEnableSupportForBetweenStreets,
       features::kAutofillEnableSupportForAdminLevel2,
-      features::kAutofillEnableSupportForAddressOverflow,
       features::kAutofillEnableSupportForApartmentNumbers,
       features::kAutofillEnableExpirationDateImprovements,
       features::kAutofillEnableParsingOfStreetLocation,

components/autofill/core/browser/webdata/addresses/address_autofill_table.cc

@@ -378,11 +378,6 @@ bool AddProfileMetadataToTable(sql::Database* db,
 bool AddProfileTypeTokensToTable(sql::Database* db,
                                  const AutofillProfile& profile) {
   for (FieldType type : GetDatabaseStoredTypesOfAutofillProfile()) {
-    if (!base::FeatureList::IsEnabled(
-            features::kAutofillEnableSupportForAddressOverflow) &&
-        type == ADDRESS_HOME_OVERFLOW) {
-      continue;
-    }
     if (!base::FeatureList::IsEnabled(
             features::kAutofillEnableSupportForBetweenStreets) &&
         (type == ADDRESS_HOME_BETWEEN_STREETS ||

components/autofill/core/browser/webdata/addresses/address_autofill_table_unittest.cc

@@ -58,8 +58,7 @@ class AddressAutofillTableProfileTest
     AddressAutofillTableTest::SetUp();
     features_.InitWithFeatures(
         {features::kAutofillEnableSupportForBetweenStreets,
-         features::kAutofillEnableSupportForAdminLevel2,
-         features::kAutofillEnableSupportForAddressOverflow},
+         features::kAutofillEnableSupportForAdminLevel2},
         {});
   }
   AutofillProfile::Source profile_source() const { return GetParam(); }

components/autofill/core/browser/webdata/addresses/autofill_profile_sync_util.cc

@@ -162,11 +162,8 @@ std::unique_ptr<EntityData> CreateEntityDataFromAutofillProfile(
       base::UTF16ToUTF8(entry.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY))));
   specifics->set_address_home_country(data_util::TruncateUTF8(
       base::UTF16ToUTF8(entry.GetRawInfo(ADDRESS_HOME_COUNTRY))));
-  if (base::FeatureList::IsEnabled(
-          features::kAutofillEnableSupportForAddressOverflow)) {
-    specifics->set_address_home_overflow(data_util::TruncateUTF8(
-        base::UTF16ToUTF8(entry.GetRawInfo(ADDRESS_HOME_OVERFLOW))));
-  }
+  specifics->set_address_home_overflow(data_util::TruncateUTF8(
+      base::UTF16ToUTF8(entry.GetRawInfo(ADDRESS_HOME_OVERFLOW))));
   specifics->set_address_home_landmark(data_util::TruncateUTF8(
       base::UTF16ToUTF8(entry.GetRawInfo(ADDRESS_HOME_LANDMARK))));
   specifics->set_address_home_between_streets_or_landmark(
@@ -239,16 +236,12 @@ std::unique_ptr<EntityData> CreateEntityDataFromAutofillProfile(
   specifics->set_address_home_country_status(
       ConvertProfileToSpecificsVerificationStatus(
           entry.GetVerificationStatus(ADDRESS_HOME_COUNTRY)));
-  if (base::FeatureList::IsEnabled(
-          features::kAutofillEnableSupportForAddressOverflow)) {
-    specifics->set_address_home_overflow_status(
-        ConvertProfileToSpecificsVerificationStatus(
-            entry.GetVerificationStatus(ADDRESS_HOME_OVERFLOW)));
-  }
-    specifics->set_address_home_landmark_status(
-        ConvertProfileToSpecificsVerificationStatus(
-            entry.GetVerificationStatus(ADDRESS_HOME_LANDMARK)));
-
+  specifics->set_address_home_overflow_status(
+      ConvertProfileToSpecificsVerificationStatus(
+          entry.GetVerificationStatus(ADDRESS_HOME_OVERFLOW)));
+  specifics->set_address_home_landmark_status(
+      ConvertProfileToSpecificsVerificationStatus(
+          entry.GetVerificationStatus(ADDRESS_HOME_LANDMARK)));
   if (base::FeatureList::IsEnabled(
           features::kAutofillEnableSupportForBetweenStreets)) {
     specifics->set_address_home_between_streets_status(
@@ -463,14 +456,11 @@ std::unique_ptr<AutofillProfile> CreateAutofillProfileFromSpecifics(
       ConvertSpecificsToProfileVerificationStatus(
           specifics.address_home_country_status()));
 
-  if (base::FeatureList::IsEnabled(
-          features::kAutofillEnableSupportForAddressOverflow)) {
-    profile->SetRawInfoWithVerificationStatus(
-        ADDRESS_HOME_OVERFLOW,
-        base::UTF8ToUTF16(specifics.address_home_overflow()),
-        ConvertSpecificsToProfileVerificationStatus(
-            specifics.address_home_overflow_status()));
-  }
+  profile->SetRawInfoWithVerificationStatus(
+      ADDRESS_HOME_OVERFLOW,
+      base::UTF8ToUTF16(specifics.address_home_overflow()),
+      ConvertSpecificsToProfileVerificationStatus(
+          specifics.address_home_overflow_status()));
 
   profile->SetRawInfoWithVerificationStatus(
       ADDRESS_HOME_BETWEEN_STREETS_OR_LANDMARK,

components/autofill/core/browser/webdata/addresses/autofill_profile_sync_util_unittest.cc

@@ -927,7 +927,6 @@ class AutofillProfileSyncUtilTest
          features::kAutofillUseINAddressModel,
          features::kAutofillUseITAddressModel,
          features::kAutofillUseMXAddressModel,
-         features::kAutofillEnableSupportForAddressOverflow,
          features::kAutofillEnableSupportForBetweenStreets,
          features::kAutofillEnableSupportForAdminLevel2,
          features::kAutofillEnableSupportForApartmentNumbers},

components/autofill/core/browser/webdata/addresses/contact_info_sync_util.cc

@@ -236,10 +236,7 @@ sync_pb::ContactInfoSpecifics ContactInfoSpecificsFromAutofillProfile(
     s.Set(specifics.mutable_address_apt_type(), ADDRESS_HOME_APT_TYPE);
   }
   s.Set(specifics.mutable_address_floor(), ADDRESS_HOME_FLOOR);
-  if (base::FeatureList::IsEnabled(
-          features::kAutofillEnableSupportForAddressOverflow)) {
-    s.Set(specifics.mutable_address_overflow(), ADDRESS_HOME_OVERFLOW);
-  }
+  s.Set(specifics.mutable_address_overflow(), ADDRESS_HOME_OVERFLOW);
   s.Set(specifics.mutable_address_landmark(), ADDRESS_HOME_LANDMARK);
   if (base::FeatureList::IsEnabled(
           features::kAutofillEnableSupportForBetweenStreets)) {
@@ -376,13 +373,8 @@ std::unique_ptr<AutofillProfile> CreateAutofillProfileFromContactInfoSpecifics(
     s.Set(specifics.address_apt_type(), ADDRESS_HOME_APT_TYPE);
   }
   s.Set(specifics.address_floor(), ADDRESS_HOME_FLOOR);
-  if (base::FeatureList::IsEnabled(
-          features::kAutofillEnableSupportForAddressOverflow)) {
-    s.Set(specifics.address_overflow(), ADDRESS_HOME_OVERFLOW);
-  }
-
-    s.Set(specifics.address_landmark(), ADDRESS_HOME_LANDMARK);
-
+  s.Set(specifics.address_overflow(), ADDRESS_HOME_OVERFLOW);
+  s.Set(specifics.address_landmark(), ADDRESS_HOME_LANDMARK);
   if (base::FeatureList::IsEnabled(
           features::kAutofillEnableSupportForBetweenStreets)) {
     s.Set(specifics.address_between_streets(), ADDRESS_HOME_BETWEEN_STREETS);

components/autofill/core/browser/webdata/addresses/contact_info_sync_util_unittest.cc

@@ -690,7 +690,6 @@ class ContactInfoSyncUtilTest
          features::kAutofillUseITAddressModel,
          features::kAutofillUseMXAddressModel,
          features::kAutofillEnableSupportForBetweenStreets,
-         features::kAutofillEnableSupportForAddressOverflow,
          features::kAutofillEnableSupportForAdminLevel2,
          features::kAutofillEnableSupportForApartmentNumbers,
          features::kAutofillTrackMultipleUseDates},

components/autofill/core/common/autofill_features.cc

@@ -186,12 +186,6 @@ BASE_FEATURE(kAutofillEnableSupportForAdminLevel2,
              "AutofillEnableSupportForAdminLevel2",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
-// Controls if Chrome support filling and importing address overflow fields.
-// TODO(crbug.com/40266693) Remove once launched.
-BASE_FEATURE(kAutofillEnableSupportForAddressOverflow,
-             "AutofillEnableSupportForAddressOverflow",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-
 // Controls if Chrome parses fields at street locations. This field type is
 // generally supported in the legacy hierarchy but there is a risk of confusing
 // an address line 1 with a street location. We don't have a good strategy for

components/autofill/core/common/autofill_features.h

@@ -53,8 +53,6 @@ BASE_DECLARE_FEATURE(kAutofillEnableSupportForBetweenStreets);
 COMPONENT_EXPORT(AUTOFILL)
 BASE_DECLARE_FEATURE(kAutofillEnableSupportForAdminLevel2);
 COMPONENT_EXPORT(AUTOFILL)
-BASE_DECLARE_FEATURE(kAutofillEnableSupportForAddressOverflow);
-COMPONENT_EXPORT(AUTOFILL)
 BASE_DECLARE_FEATURE(kAutofillEnableParsingOfStreetLocation);
 COMPONENT_EXPORT(AUTOFILL)
 BASE_DECLARE_FEATURE(kAutofillEnableRationalizationEngineForMX);