Skip to content

GitLab

T
tangled
Commit 6a6e0b94 authored by Matthias Körber's avatar Matthias Körber Committed by Commit Bot
Browse files
Options

[Autofill] Remove experiments that have been enabled by default 

The features in the removed experiment have all been enabled by default.

Change-Id: Ia80687aa8c68f560b4c4810136769fea195bf602
Bug: 1076175
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521731
Commit-Queue: Matthias Körber <koerber@google.com>
Reviewed-by: default avatarCaitlin Fischer <caitlinfischer@google.com>
Reviewed-by: default avatarOlivier Robin <olivierrobin@chromium.org>
Reviewed-by: default avatarChristoph Schwering <schwering@google.com>
Reviewed-by: default avatarIlya Sherman <isherman@chromium.org>
Auto-Submit: Matthias Körber <koerber@google.com>
Cr-Commit-Position: refs/heads/master@{#826881}
parent 4ac6df50
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 121 deletions
chrome/browser/autofill/form_structure_browsertest.cc
View file @ 6a6e0b94
......@@ -168,14 +168,14 @@ FormStructureBrowserTest::FormStructureBrowserTest()
: DataDrivenTest(GetTestDataDir()) {
feature_list_.InitWithFeatures(
// Enabled
{
// TODO(crbug.com/1098943): Remove once experiment is over.
autofill::features::kAutofillEnableSupportForMoreStructureInNames,
// TODO(crbug.com/1125978): Remove once launched.
autofill::features::kAutofillEnableSupportForMoreStructureInAddresses,
// TODO(crbug.com/896689): Remove once launched.
autofill::features::kAutofillNameSectionsWithRendererIds,
},
{// TODO(crbug.com/1098943): Remove once experiment is over.
autofill::features::kAutofillEnableSupportForMoreStructureInNames,
// TODO(crbug.com/1125978): Remove once launched.
autofill::features::kAutofillEnableSupportForMoreStructureInAddresses,
// TODO(crbug.com/896689): Remove once launched.
autofill::features::kAutofillNameSectionsWithRendererIds,
// TODO(crbug.com/1076175) Remove once launched.
autofill::features::kAutofillUseNewSectioningMethod},
// Disabled
{autofill::features::kAutofillRestrictUnownedFieldsToFormlessCheckout});
}
......
components/autofill/core/browser/form_parsing/address_field.cc
View file @ 6a6e0b94
......@@ -449,63 +449,6 @@ AddressField::ParseNameLabelResult AddressField::ParseNameAndLabelSeparately(
return RESULT_MATCH_NONE;
}
bool AddressField::ParseCityStateZipCode(AutofillScanner* scanner,
const std::string& page_language) {
// Simple cases.
if (scanner->IsEnd())
return false;
if (city_ && state_ && zip_)
return false;
if (state_ && zip_)
return ParseCity(scanner, page_language);
if (city_ && zip_)
return ParseState(scanner, page_language);
if (city_ && state_)
return ParseZipCode(scanner, page_language);
// Check for matches to both name and label.
ParseNameLabelResult city_result =
ParseNameAndLabelForCity(scanner, page_language);
if (city_result == RESULT_MATCH_NAME_LABEL)
return true;
ParseNameLabelResult state_result =
ParseNameAndLabelForState(scanner, page_language);
if (state_result == RESULT_MATCH_NAME_LABEL)
return true;
ParseNameLabelResult zip_result =
ParseNameAndLabelForZipCode(scanner, page_language);
if (zip_result == RESULT_MATCH_NAME_LABEL)
return true;
// Check if there is only one potential match.
bool maybe_city = city_result != RESULT_MATCH_NONE;
bool maybe_state = state_result != RESULT_MATCH_NONE;
bool maybe_zip = zip_result != RESULT_MATCH_NONE;
if (maybe_city && !maybe_state && !maybe_zip)
return SetFieldAndAdvanceCursor(scanner, &city_);
if (maybe_state && !maybe_city && !maybe_zip)
return SetFieldAndAdvanceCursor(scanner, &state_);
if (maybe_zip && !maybe_city && !maybe_state)
return ParseZipCode(scanner, page_language);
// Otherwise give name priority over label.
if (city_result == RESULT_MATCH_NAME)
return SetFieldAndAdvanceCursor(scanner, &city_);
if (state_result == RESULT_MATCH_NAME)
return SetFieldAndAdvanceCursor(scanner, &state_);
if (zip_result == RESULT_MATCH_NAME)
return ParseZipCode(scanner, page_language);
if (city_result == RESULT_MATCH_LABEL)
return SetFieldAndAdvanceCursor(scanner, &city_);
if (state_result == RESULT_MATCH_LABEL)
return SetFieldAndAdvanceCursor(scanner, &state_);
if (zip_result == RESULT_MATCH_LABEL)
return ParseZipCode(scanner, page_language);
return false;
}
bool AddressField::ParseCityStateCountryZipCode(
AutofillScanner* scanner,
const std::string& page_language) {
......
components/autofill/core/browser/form_parsing/address_field.h
View file @ 6a6e0b94
......@@ -72,13 +72,6 @@ class AddressField : public FormField {
bool ParseState(AutofillScanner* scanner, const std::string& page_language);
// Parses the current field pointed to by |scanner|, if it exists, and tries
// to figure out whether the field's type: city, state, zip, or none of those.
// TODO(crbug.com/1073555) Delete this once experiment
// |kAutofillUseParseCityStateCountryZipCodeInHeuristic| has been launched.
bool ParseCityStateZipCode(AutofillScanner* scanner,
const std::string& page_language);
// Parses the current field pointed to by |scanner|, if it exists, and tries
// to figure out whether the field's type: city, state, country, zip, or
// none of those.
......
components/test/data/autofill/heuristics/output/012_autocomplete_attribute_advanced.out
View file @ 6a6e0b94
HTML_TYPE_NAME | 1.n | | | -default-default
HTML_TYPE_EMAIL | 1.e | | | -default-default
HTML_TYPE_NAME | 1.n | | | one-shipping-default
HTML_TYPE_EMAIL | 1.e | | | one-shipping-default
HTML_TYPE_ADDRESS_LINE1 | 1.a | | | one-shipping-default
UNKNOWN_TYPE | 2.name | | | 2.name_1-default
EMAIL_ADDRESS | 2.email | | | 2.name_1-default
......
components/test/data/autofill/heuristics/output/151_ticketmaster.com.out
View file @ 6a6e0b94
HTML_TYPE_CREDIT_CARD_NUMBER | new_credit_card_number | Card Number * | | -default-cc
HTML_TYPE_CREDIT_CARD_TYPE | new_credit_card_type_id | Card Type * | | -default-cc
HTML_TYPE_CREDIT_CARD_EXP_MONTH | new_credit_card_expire_month | Exp Month * | | -default-cc
HTML_TYPE_CREDIT_CARD_EXP_YEAR | new_credit_card_expire_year | Exp Year * | | -default-cc
CREDIT_CARD_VERIFICATION_CODE | new_credit_card_cin | Security Code * | | -default-cc
HTML_TYPE_CREDIT_CARD_NUMBER | new_credit_card_number | Card Number * | | credit-card-cc
HTML_TYPE_CREDIT_CARD_TYPE | new_credit_card_type_id | Card Type * | | credit-card-cc
HTML_TYPE_CREDIT_CARD_EXP_MONTH | new_credit_card_expire_month | Exp Month * | | credit-card-cc
HTML_TYPE_CREDIT_CARD_EXP_YEAR | new_credit_card_expire_year | Exp Year * | | credit-card-cc
CREDIT_CARD_VERIFICATION_CODE | new_credit_card_cin | Security Code * | | credit-card-cc
HTML_TYPE_GIVEN_NAME | first_name | First Name * | | -billing-default
HTML_TYPE_FAMILY_NAME | last_name | Last Name * | | -billing-default
HTML_TYPE_ADDRESS_LINE1 | address1 | Address * | | -billing-default
ADDRESS_HOME_LINE2 | unit | Unit # | | -default-default
ADDRESS_HOME_LINE2 | unit | Unit # | | -billing-default
HTML_TYPE_ADDRESS_LINE2 | address2 | Address Line 2 | | -billing-default
HTML_TYPE_ADDRESS_LEVEL2 | city | City * | | -billing-default
ADDRESS_HOME_COUNTRY | country | Country * | Canada | -default-default
ADDRESS_HOME_COUNTRY | country | Country * | Canada | -billing-default
HTML_TYPE_ADDRESS_LEVEL1 | state_id | Province * | | -billing-default
HTML_TYPE_POSTAL_CODE | postal_code | Postal Code * | | -billing-default
HTML_TYPE_TEL | evening_phone | Phone * | | -billing-default
HTML_TYPE_TEL | mobile_phone | Alternate Phone | | -billing-default
UNKNOWN_TYPE | store_payment | Store my card for faster checkout next time. | on | -default-default
UNKNOWN_TYPE | store_payment | Store my card for faster checkout next time. | on | -billing-default
components/test/data/autofill/heuristics/output/159_bug_966406_transavia.com.out
View file @ 6a6e0b94
UNKNOWN_TYPE | terms | Par ex. Comment puis-je m'enregistrer en ligne ? | | terms_1-default
UNKNOWN_TYPE | loginID | Adresse e-mail | | loginID_1-default
UNKNOWN_TYPE | password | Mot de passe | | loginID_1-default
UNKNOWN_TYPE | retrieveBookingByLastname.RecordLocator | Numéro de réservation | | retrieveBookingByLastname.RecordLocator_1-default
# INCORRECT: This should be a last name, but the parser cannot return a last name without a first name
UNKNOWN_TYPE | retrieveBookingByLastname.RecordLocator | Numéro de réservation | | retrieveBookingByLastname.RecordLocator_1-default
UNKNOWN_TYPE | retrieveBookingByLastname.LastName | Nom de famille | | retrieveBookingByLastname.RecordLocator_1-default
UNKNOWN_TYPE | retrieveBookingByLastname.Day | Jour | | retrieveBookingByLastname.RecordLocator_1-default
UNKNOWN_TYPE | retrieveBookingByLastname.Month | Mois | | retrieveBookingByLastname.RecordLocator_1-default
......
components/test/data/autofill/heuristics/output/163_giftcard_hotels.com.out
View file @ 6a6e0b94
......@@ -2,29 +2,29 @@ HTML_TYPE_GIVEN_NAME | shoppingCartOrderDetails.travelDetails[0].hotelData.roomD
HTML_TYPE_FAMILY_NAME | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].lastName | Last name* | | room0-default-default
HTML_TYPE_TEL | bookingContact.contactDetails.phoneNumber | Cell phone number*We’ll only contact you in an emergency | | contact-default-default
HTML_TYPE_EMAIL | bookingContact.contactDetails.emailAddress | Email address*We’ll send your confirmation email to this address | | contact-default-default
UNKNOWN_TYPE | bookingContact.contactDetails.specialDeal | Check this box if you would like to receive our Hotels.com special offers email newsletter containing great hotel promotions. | true | -default-default
UNKNOWN_TYPE | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].specialRequests | Special requests | | -default-default
UNKNOWN_TYPE | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].accessibilityIds[0] | Accessible bathroom | 2420 | -default-default
UNKNOWN_TYPE | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].accessibilityIds[1] | In-room accessibility | 2423 | -default-default
UNKNOWN_TYPE | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].accessibilityIds[2] | Roll-in shower | 2421 | -default-default
UNKNOWN_TYPE | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].accessibilityIds[3] | Wheelchair accessible parking | 2422 | -default-default
UNKNOWN_TYPE | payment-details-selector | Credit / Debit card | CREDITCARD | -default-default
UNKNOWN_TYPE | payment-details-selector | PayPal | PAYPAL | -default-default
UNKNOWN_TYPE | payment-details-selector | Gift Card | GIFTCARD | -default-default
UNKNOWN_TYPE | payment-details-selector | Apple Pay | APPLEPAY | -default-default
UNKNOWN_TYPE | giftCardNumber | Enter gift card number (16 digits) | | -default-default
UNKNOWN_TYPE | bookingContact.contactDetails.specialDeal | Check this box if you would like to receive our Hotels.com special offers email newsletter containing great hotel promotions. | true | contact-default-default
UNKNOWN_TYPE | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].specialRequests | Special requests | | contact-default-default
UNKNOWN_TYPE | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].accessibilityIds[0] | Accessible bathroom | 2420 | contact-default-default
UNKNOWN_TYPE | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].accessibilityIds[1] | In-room accessibility | 2423 | contact-default-default
UNKNOWN_TYPE | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].accessibilityIds[2] | Roll-in shower | 2421 | contact-default-default
UNKNOWN_TYPE | shoppingCartOrderDetails.travelDetails[0].hotelData.roomDetails[0].roomType.roomOccupations[0].accessibilityIds[3] | Wheelchair accessible parking | 2422 | contact-default-default
UNKNOWN_TYPE | payment-details-selector | Credit / Debit card | CREDITCARD | contact-default-default
UNKNOWN_TYPE | payment-details-selector | PayPal | PAYPAL | contact-default-default
UNKNOWN_TYPE | payment-details-selector | Gift Card | GIFTCARD | contact-default-default
UNKNOWN_TYPE | payment-details-selector | Apple Pay | APPLEPAY | contact-default-default
UNKNOWN_TYPE | giftCardNumber | Enter gift card number (16 digits) | | contact-default-default
# This is undesirable and should be unknown type.
ADDRESS_HOME_ZIP | giftCardPinCode | Enter gift card PIN code (8 digits)If your gift card has a silver panel, scratch it off to reveal the code | | -default-default
UNKNOWN_TYPE | paymentAmount | Enter the amount you`d like to pay with your gift card | | -default-default
UNKNOWN_TYPE | payments.submittedPayments[0].storedPayment.spsId | Saved card | | stored-default-default
HTML_TYPE_CREDIT_CARD_NAME_FIRST | payments.submittedPayments[0].billingDetailsForm.billingNameForm.billingFirstName | First name* | | -default-cc
HTML_TYPE_CREDIT_CARD_NAME_LAST | payments.submittedPayments[0].billingDetailsForm.billingNameForm.billingLastName | Last name* | | -default-cc
HTML_TYPE_CREDIT_CARD_TYPE | payments.submittedPayments[0].paymentIdentifier | Card type* | | -default-cc
HTML_TYPE_CREDIT_CARD_NUMBER | payments.submittedPayments[0].cardNumber | Credit card number* | | -default-cc
HTML_TYPE_CREDIT_CARD_EXP_MONTH | payments.submittedPayments[0].expiryMonth | Expiry month* | | -default-cc
HTML_TYPE_CREDIT_CARD_EXP_2_DIGIT_YEAR | payments.submittedPayments[0].expiryYear | Expiry year* | | -default-cc
HTML_TYPE_CREDIT_CARD_VERIFICATION_CODE | payments.submittedPayments[0].securityCode | Security code* | | -default-cc
UNKNOWN_TYPE | payments.submittedPayments[0].paymentStoringFormFields.hasToSavePayment | Save this card | true | -default-default
UNKNOWN_TYPE | payments.submittedPayments[0].paymentStoringFormFields.nickName | Card Nickname  (optional) | | -default-default
ADDRESS_HOME_ZIP | giftCardPinCode | Enter gift card PIN code (8 digits)If your gift card has a silver panel, scratch it off to reveal the code | | contact-default-default
UNKNOWN_TYPE | paymentAmount | Enter the amount you`d like to pay with your gift card | | contact-default-default
UNKNOWN_TYPE | payments.submittedPayments[0].storedPayment.spsId | Saved card | | contact-default-default
HTML_TYPE_CREDIT_CARD_NAME_FIRST | payments.submittedPayments[0].billingDetailsForm.billingNameForm.billingFirstName | First name* | | credit-card-cc
HTML_TYPE_CREDIT_CARD_NAME_LAST | payments.submittedPayments[0].billingDetailsForm.billingNameForm.billingLastName | Last name* | | credit-card-cc
HTML_TYPE_CREDIT_CARD_TYPE | payments.submittedPayments[0].paymentIdentifier | Card type* | | credit-card-cc
HTML_TYPE_CREDIT_CARD_NUMBER | payments.submittedPayments[0].cardNumber | Credit card number* | | credit-card-cc
HTML_TYPE_CREDIT_CARD_EXP_MONTH | payments.submittedPayments[0].expiryMonth | Expiry month* | | credit-card-cc
HTML_TYPE_CREDIT_CARD_EXP_2_DIGIT_YEAR | payments.submittedPayments[0].expiryYear | Expiry year* | | credit-card-cc
HTML_TYPE_CREDIT_CARD_VERIFICATION_CODE | payments.submittedPayments[0].securityCode | Security code* | | credit-card-cc
UNKNOWN_TYPE | payments.submittedPayments[0].paymentStoringFormFields.hasToSavePayment | Save this card | true | contact-default-default
UNKNOWN_TYPE | payments.submittedPayments[0].paymentStoringFormFields.nickName | Card Nickname  (optional) | | contact-default-default
HTML_TYPE_COUNTRY_CODE | payments.submittedPayments[0].billingDetailsForm.billingAddressForm.billingCountry | Country* | US | -billing-default
HTML_TYPE_POSTAL_CODE | payments.submittedPayments[0].billingDetailsForm.billingAddressForm.billingPostalCode | ZIP codeWe’ll use this to verify your credit card details | | -billing-default
ios/chrome/browser/autofill/form_structure_browsertest.mm
View file @ 6a6e0b94
......@@ -140,6 +140,8 @@ FormStructureBrowserTest::FormStructureBrowserTest()
autofill::features::kAutofillEnableSupportForMoreStructureInAddresses,
// TODO(crbug.com/896689): Remove once launched.
autofill::features::kAutofillNameSectionsWithRendererIds,
// TODO(crbug.com/1076175) Remove once launched.
autofill::features::kAutofillUseNewSectioningMethod,
},
// Disabled
{autofill::features::kAutofillRestrictUnownedFieldsToFormlessCheckout});
......
testing/variations/fieldtrial_testing_config.json
View file @ 6a6e0b94
......@@ -711,24 +711,10 @@
"windows"
],
"experiments": [
{
"name": "EnableAllImprovementsButNewSectioning",
"enable_features": [
"AutofillAllowHtmlTypeCountryCodesWithFullNames",
"AutofillImportPrefilledCountryAndStateValues",
"AutofillKeepCachedFormValues",
"AutofillProfileImportFromUnfocusableFields",
"AutofillProfileImportFromUnifiedSection",
"AutofillRetrieveFromCacheWithRendererIds",
"AutofillUsePageLanguageToTranslateCountryNames",
"AutofillUseParseCityStateCountryZipCodeInHeuristic",
"AutofillUseVariationCountryCode"
]
},
{
"name": "EnableNewSectioning",
"enable_features": [
"AutofillSectionUponRedundantNameInfo"
"AutofillUseNewSectioningMethod"
]
}
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment