diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptRenderTest.java index 49218f3282a0e6..46f8896bcdbd48 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptRenderTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptRenderTest.java @@ -52,10 +52,7 @@ */ @DoNotBatch(reason = "The tests can't be batched because they run for different set-ups.") @RunWith(ParameterizedRunner.class) -@EnableFeatures({ - ChromeFeatureList.AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT, - ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES -}) +@EnableFeatures({ChromeFeatureList.AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT}) public class SaveUpdateAddressProfilePromptRenderTest extends BlankUiTestActivityTestCase { private static final long NATIVE_SAVE_UPDATE_ADDRESS_PROFILE_PROMPT_CONTROLLER = 100L; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragmentTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragmentTest.java index ba7c9aa2fa5fb8..6839561f9965ff 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragmentTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragmentTest.java @@ -173,7 +173,6 @@ public void tearDown() throws TimeoutException { @Test @MediumTest @Feature({"Preferences"}) - @EnableFeatures({ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES}) public void testAddProfile() throws Exception { AutofillProfilesFragment autofillProfileFragment = sSettingsActivityTestRule.getFragment(); @@ -215,7 +214,6 @@ public void testAddProfile() throws Exception { @Test @MediumTest @Feature({"Preferences"}) - @EnableFeatures({ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES}) public void testAddIncompletedProfile() throws Exception { AutofillProfilesFragment autofillProfileFragment = sSettingsActivityTestRule.getFragment(); @@ -247,7 +245,6 @@ public void testAddIncompletedProfile() throws Exception { @Test @MediumTest @Feature({"Preferences"}) - @EnableFeatures({ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES}) public void testAddProfileWithInvalidPhone() throws Exception { AutofillProfilesFragment autofillProfileFragment = sSettingsActivityTestRule.getFragment(); @@ -389,7 +386,6 @@ public void testDeleteAccountProfile() throws Exception { @Test @MediumTest @Feature({"Preferences"}) - @EnableFeatures({ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES}) public void testEditProfile() throws Exception { AutofillProfilesFragment autofillProfileFragment = sSettingsActivityTestRule.getFragment(); @@ -442,7 +438,6 @@ public void testEditProfile() throws Exception { @Test @MediumTest @Feature({"Preferences"}) - @EnableFeatures({ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES}) public void testEditAccountProfile() throws Exception { String email = "test@account"; setUpMockPrimaryAccount(email); @@ -528,7 +523,6 @@ public void testEditAccountProfile() throws Exception { @Test @MediumTest @Feature({"Preferences"}) - @EnableFeatures({ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES}) public void testEditInvalidAccountProfile() throws Exception { mHelper.setProfile( AutofillProfile.builder() diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptTest.java index 49d2bee1d1877a..bab25595bd0425 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptTest.java @@ -55,10 +55,7 @@ /** Unit tests for {@link SaveUpdateAddressProfilePrompt}. */ @RunWith(BaseRobolectricTestRunner.class) @Config(manifest = Config.NONE) -@EnableFeatures({ - ChromeFeatureList.AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT, - ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES -}) +@EnableFeatures({ChromeFeatureList.AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT}) public class SaveUpdateAddressProfilePromptTest { private static final long NATIVE_SAVE_UPDATE_ADDRESS_PROFILE_PROMPT_CONTROLLER = 100L; private static final boolean NO_MIGRATION = false; diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/editors/AddressEditorMediator.java b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/editors/AddressEditorMediator.java index bb4439fd6f7028..d8b4aeec4cc5c0 100644 --- a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/editors/AddressEditorMediator.java +++ b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/editors/AddressEditorMediator.java @@ -91,7 +91,6 @@ class AddressEditorMediator { private final boolean mSaveToDisk; private final Map mAddressFields = new HashMap<>(); private final PropertyModel mCountryField; - private final @Nullable PropertyModel mHonorificField; private final PropertyModel mPhoneField; private final PropertyModel mEmailField; private final @Nullable PropertyModel mNicknameField; @@ -161,23 +160,6 @@ private static List getSupportedCountries( .with(VALUE, AutofillAddress.getCountryCode(mProfileToEdit)) .build(); - // Honorific prefix is present only for autofill settings. - mHonorificField = - ChromeFeatureList.isEnabled( - ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES) - ? new PropertyModel.Builder(TEXT_ALL_KEYS) - .with(TEXT_FIELD_TYPE, FieldType.NAME_HONORIFIC_PREFIX) - .with( - LABEL, - mContext.getString( - R.string.autofill_profile_editor_honorific_prefix)) - .with(IS_REQUIRED, false) - .with( - VALUE, - mProfileToEdit.getInfo(FieldType.NAME_HONORIFIC_PREFIX)) - .build() - : null; - // Phone number is present for all countries. mPhoneField = new PropertyModel.Builder(TEXT_ALL_KEYS) @@ -232,7 +214,6 @@ void setCustomDoneButtonText(@Nullable String customDoneButtonText) { * Builds an editor model with the following fields. * * [ country dropdown ] <----- country dropdown is always present. - * [ honorific field ] <----- above name, present if purpose is Purpose.AUTOFILL_SETTINGS. * [ an address field ] \ * [ an address field ] \ * ... <-- field order, presence, required, and labels depend on country. @@ -323,12 +304,6 @@ private ListModel buildEditorFieldList(String countryCode, String lan editorFields.add(new FieldItem(DROPDOWN, mCountryField, /* isFullLine= */ true)); for (AutofillAddressUiComponent component : mVisibleEditorFields) { - // Honorific prefix should go before name. - if (component.id == FieldType.NAME_FULL && mHonorificField != null) { - editorFields.add( - new FieldItem(TEXT_INPUT, mHonorificField, /* isFullLine= */ true)); - } - PropertyModel field = getFieldForFieldType(component.id); // Labels depend on country, e.g., state is called province in some countries. These are @@ -409,9 +384,6 @@ private void commitChanges(AutofillProfile profile) { if (mEmailField != null) { profile.setInfo(FieldType.EMAIL_ADDRESS, mEmailField.get(VALUE)); } - if (mHonorificField != null) { - profile.setInfo(FieldType.NAME_HONORIFIC_PREFIX, mHonorificField.get(VALUE)); - } // Autofill profile bridge normalizes the language code for the autofill profile. profile.setLanguageCode(mAutofillProfileBridge.getCurrentBestLanguageCode()); diff --git a/chrome/browser/autofill/android/javatest/src/org/chromium/chrome/browser/autofill/editors/AddressEditorRenderTest.java b/chrome/browser/autofill/android/javatest/src/org/chromium/chrome/browser/autofill/editors/AddressEditorRenderTest.java index c96b2b9c52f0a3..ecf4aa97e6881d 100644 --- a/chrome/browser/autofill/android/javatest/src/org/chromium/chrome/browser/autofill/editors/AddressEditorRenderTest.java +++ b/chrome/browser/autofill/android/javatest/src/org/chromium/chrome/browser/autofill/editors/AddressEditorRenderTest.java @@ -75,7 +75,6 @@ @RunWith(ParameterizedRunner.class) @ParameterAnnotations.UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class) @EnableFeatures({ - ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES, ChromeFeatureList.AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT }) @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE}) @@ -127,7 +126,7 @@ public class AddressEditorRenderTest extends BlankUiTestActivityTestCase { @Rule public final RenderTestRule mRenderTestRule = RenderTestRule.Builder.withPublicCorpus() - .setRevision(0) + .setRevision(1) .setBugComponent(Component.UI_BROWSER_AUTOFILL) .build(); diff --git a/chrome/browser/autofill/android/junit/src/org/chromium/chrome/browser/autofill/editors/AddressEditorTest.java b/chrome/browser/autofill/android/junit/src/org/chromium/chrome/browser/autofill/editors/AddressEditorTest.java index 154b67f32a0351..469cfb6661d400 100644 --- a/chrome/browser/autofill/android/junit/src/org/chromium/chrome/browser/autofill/editors/AddressEditorTest.java +++ b/chrome/browser/autofill/android/junit/src/org/chromium/chrome/browser/autofill/editors/AddressEditorTest.java @@ -109,10 +109,7 @@ /** Unit tests for autofill address editor. */ @RunWith(BaseRobolectricTestRunner.class) @Config(manifest = Config.NONE) -@EnableFeatures({ - ChromeFeatureList.AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT, - ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES -}) +@EnableFeatures({ChromeFeatureList.AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT}) public class AddressEditorTest { private static final String USER_EMAIL = "example@gmail.com"; private static final Locale DEFAULT_LOCALE = Locale.getDefault(); @@ -355,38 +352,29 @@ private void validateShownFields( assertNotNull(editorModel); ListModel editorFields = editorModel.get(EDITOR_FIELDS); // editorFields[0] - country dropdown. - // editorFields[1] - honorific field. - // editorFields[2] - full name field. - // editorFields[3] - admin area field. - // editorFields[4] - locality field. - // editorFields[5] - dependent locality field. - // editorFields[6] - organization field. - // editorFields[7] - sorting code field. - // editorFields[8] - postal code field. - // editorFields[9] - street address field. - // editorFields[10] - phone number field. - // editorFields[11] - email field. - // editorFields[12] - nickname field. - assertEquals(13, editorFields.size()); + // editorFields[1] - full name field. + // editorFields[2] - admin area field. + // editorFields[3] - locality field. + // editorFields[4] - dependent locality field. + // editorFields[5] - organization field. + // editorFields[6] - sorting code field. + // editorFields[7] - postal code field. + // editorFields[8] - street address field. + // editorFields[9] - phone number field. + // editorFields[10] - email field. + // editorFields[11] - nickname field. + assertEquals(12, editorFields.size()); // Fields obtained from backend must be placed after the country dropdown. - // Note: honorific prefix always comes before the full name field. validateTextField( editorFields.get(1), - profile.getHonorificPrefix(), - FieldType.NAME_HONORIFIC_PREFIX, - mActivity.getString(R.string.autofill_profile_editor_honorific_prefix), - /* isRequired= */ false, - /* isFullLine= */ true); - validateTextField( - editorFields.get(2), profile.getFullName(), FieldType.NAME_FULL, /* label= */ "full name label", shouldMarkFieldsRequired, /* isFullLine= */ true); validateTextField( - editorFields.get(3), + editorFields.get(2), profile.getRegion(), FieldType.ADDRESS_HOME_STATE, /* label= */ "admin area label", @@ -394,7 +382,7 @@ private void validateShownFields( /* isFullLine= */ true); // Locality field is forced to occupy full line. validateTextField( - editorFields.get(4), + editorFields.get(3), profile.getLocality(), FieldType.ADDRESS_HOME_CITY, /* label= */ "locality label", @@ -406,7 +394,7 @@ private void validateShownFields( // the existing address profile is empty. It is considered required for new address // profiles. validateTextField( - editorFields.get(5), + editorFields.get(4), profile.getDependentLocality(), FieldType.ADDRESS_HOME_DEPENDENT_LOCALITY, /* label= */ "dependent locality label", @@ -414,7 +402,7 @@ private void validateShownFields( /* isFullLine= */ true); validateTextField( - editorFields.get(6), + editorFields.get(5), profile.getCompanyName(), FieldType.COMPANY_NAME, /* label= */ "organization label", @@ -422,21 +410,21 @@ private void validateShownFields( /* isFullLine= */ true); validateTextField( - editorFields.get(7), + editorFields.get(6), profile.getSortingCode(), FieldType.ADDRESS_HOME_SORTING_CODE, /* label= */ "sorting code label", /* isRequired= */ false, /* isFullLine= */ false); validateTextField( - editorFields.get(8), + editorFields.get(7), profile.getPostalCode(), FieldType.ADDRESS_HOME_ZIP, /* label= */ "postal code label", shouldMarkFieldsRequired, /* isFullLine= */ false); validateTextField( - editorFields.get(9), + editorFields.get(8), profile.getStreetAddress(), FieldType.ADDRESS_HOME_STREET_ADDRESS, /* label= */ "street address label", @@ -447,30 +435,28 @@ private void validateShownFields( private void validateErrorMessages(PropertyModel editorModel, boolean errorsPresent) { assertNotNull(editorModel); ListModel editorFields = editorModel.get(EDITOR_FIELDS); - assertEquals(13, editorFields.size()); + assertEquals(12, editorFields.size()); Matcher requiredFieldMatcher = errorsPresent ? not(isEmptyString()) : anyOf(nullValue(), isEmptyString()); assertThat(editorFields.get(0).model.get(ERROR_MESSAGE), requiredFieldMatcher); + assertThat(editorFields.get(1).model.get(ERROR_MESSAGE), requiredFieldMatcher); assertThat( - editorFields.get(1).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); - assertThat(editorFields.get(2).model.get(ERROR_MESSAGE), requiredFieldMatcher); - assertThat( - editorFields.get(3).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); + editorFields.get(2).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); + assertThat(editorFields.get(3).model.get(ERROR_MESSAGE), requiredFieldMatcher); assertThat(editorFields.get(4).model.get(ERROR_MESSAGE), requiredFieldMatcher); - assertThat(editorFields.get(5).model.get(ERROR_MESSAGE), requiredFieldMatcher); assertThat( - editorFields.get(6).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); + editorFields.get(5).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); assertThat( - editorFields.get(7).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); + editorFields.get(6).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); + assertThat(editorFields.get(7).model.get(ERROR_MESSAGE), requiredFieldMatcher); assertThat(editorFields.get(8).model.get(ERROR_MESSAGE), requiredFieldMatcher); - assertThat(editorFields.get(9).model.get(ERROR_MESSAGE), requiredFieldMatcher); + assertThat( + editorFields.get(9).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); assertThat( editorFields.get(10).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); assertThat( editorFields.get(11).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); - assertThat( - editorFields.get(12).model.get(ERROR_MESSAGE), anyOf(nullValue(), isEmptyString())); } @Test @@ -779,10 +765,7 @@ public void validateUIStrings_AccountAddressProfile_UpdateAccountProfileFlow() { @Test @SmallTest - @DisableFeatures({ - ChromeFeatureList.AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT, - ChromeFeatureList.AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES - }) + @DisableFeatures({ChromeFeatureList.AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT}) public void validateDefaultFields_NicknamesDisabled_HonorificDisabled() { setUpAddressUiComponents(new ArrayList()); mAddressEditor = @@ -1106,14 +1089,14 @@ public void edit_NewAddressProfile_EligibleForAddressAccountStorage() { PropertyModel editorModel = mAddressEditor.getEditorModelForTesting(); assertNotNull(editorModel); ListModel editorFields = editorModel.get(EDITOR_FIELDS); - assertEquals(13, editorFields.size()); + assertEquals(12, editorFields.size()); // Set values of the required fields. - editorFields.get(2).model.set(VALUE, "New Name"); - editorFields.get(4).model.set(VALUE, "Locality"); - editorFields.get(5).model.set(VALUE, "Dependent locality"); - editorFields.get(8).model.set(VALUE, "Postal code"); - editorFields.get(9).model.set(VALUE, "Street address"); + editorFields.get(1).model.set(VALUE, "New Name"); + editorFields.get(3).model.set(VALUE, "Locality"); + editorFields.get(4).model.set(VALUE, "Dependent locality"); + editorFields.get(7).model.set(VALUE, "Postal code"); + editorFields.get(8).model.set(VALUE, "Street address"); editorModel.get(DONE_RUNNABLE).run(); verify(mDelegate, times(1)).onDone(mAddressCapture.capture()); @@ -1142,12 +1125,11 @@ public void edit_AlterAddressProfile_Cancel() { PropertyModel editorModel = mAddressEditor.getEditorModelForTesting(); assertNotNull(editorModel); ListModel editorFields = editorModel.get(EDITOR_FIELDS); - assertEquals(13, editorFields.size()); + assertEquals(12, editorFields.size()); // Verify behaviour only on the relevant subset of fields. - editorFields.get(1).model.set(VALUE, "New honorific prefix"); - editorFields.get(2).model.set(VALUE, "New Name"); - editorFields.get(3).model.set(VALUE, "New admin area"); + editorFields.get(1).model.set(VALUE, "New Name"); + editorFields.get(2).model.set(VALUE, "New admin area"); editorModel.get(CANCEL_RUNNABLE).run(); verify(mDelegate, times(0)).onDone(any()); @@ -1173,12 +1155,12 @@ public void edit_AlterAddressProfile_CommitChanges() { assertNotNull(mAddressEditor.getEditorModelForTesting()); PropertyModel editorModel = mAddressEditor.getEditorModelForTesting(); ListModel editorFields = editorModel.get(EDITOR_FIELDS); - assertEquals(13, editorFields.size()); + assertEquals(12, editorFields.size()); // Verify behaviour only on the relevant subset of fields. - editorFields.get(4).model.set(VALUE, "New locality"); - editorFields.get(5).model.set(VALUE, "New dependent locality"); - editorFields.get(6).model.set(VALUE, "New organization"); + editorFields.get(3).model.set(VALUE, "New locality"); + editorFields.get(4).model.set(VALUE, "New dependent locality"); + editorFields.get(5).model.set(VALUE, "New organization"); editorModel.get(DONE_RUNNABLE).run(); verify(mDelegate, times(1)).onDone(mAddressCapture.capture()); @@ -1212,14 +1194,13 @@ public void edit_AlterAddressProfile_CommitChanges_InvisibleFieldsNotReset() { assertNotNull(editorModel); ListModel editorFields = editorModel.get(EDITOR_FIELDS); // editorFields[0] - country dropdown. - // editorFields[1] - honorific prefix field. - // editorFields[2] - full name field. - // editorFields[3] - admin area field. - // editorFields[4] - locality field. - // editorFields[5] - phone number field. - // editorFields[6] - email field. - // editorFields[7] - nickname field. - assertEquals(8, editorFields.size()); + // editorFields[1] - full name field. + // editorFields[2] - admin area field. + // editorFields[3] - locality field. + // editorFields[4] - phone number field. + // editorFields[5] - email field. + // editorFields[6] - nickname field. + assertEquals(7, editorFields.size()); editorModel.get(DONE_RUNNABLE).run(); verify(mDelegate, times(1)).onDone(mAddressCapture.capture()); @@ -1251,17 +1232,17 @@ public void accountSavingDisallowedForUnsupportedCountry() { PropertyModel editorModel = mAddressEditor.getEditorModelForTesting(); assertNotNull(editorModel); ListModel editorFields = editorModel.get(EDITOR_FIELDS); - assertEquals(13, editorFields.size()); + assertEquals(12, editorFields.size()); PropertyModel countryDropdown = editorFields.get(0).model; setDropdownKey(countryDropdown, "CU"); // Set values of the required fields. - editorFields.get(2).model.set(VALUE, "New Name"); - editorFields.get(4).model.set(VALUE, "Locality"); - editorFields.get(5).model.set(VALUE, "Dependent locality"); - editorFields.get(8).model.set(VALUE, "Postal code"); - editorFields.get(9).model.set(VALUE, "Street address"); + editorFields.get(1).model.set(VALUE, "New Name"); + editorFields.get(3).model.set(VALUE, "Locality"); + editorFields.get(4).model.set(VALUE, "Dependent locality"); + editorFields.get(7).model.set(VALUE, "Postal code"); + editorFields.get(8).model.set(VALUE, "Street address"); editorModel.get(DONE_RUNNABLE).run(); verify(mDelegate, times(1)).onDone(mAddressCapture.capture()); @@ -1291,7 +1272,7 @@ public void countryDropDownExcludesUnsupportedCountries_saveInAccountFlow() { PropertyModel editorModel = mAddressEditor.getEditorModelForTesting(); assertNotNull(editorModel); ListModel editorFields = editorModel.get(EDITOR_FIELDS); - assertEquals(13, editorFields.size()); + assertEquals(12, editorFields.size()); assertThat( editorFields.get(0).model.get(DROPDOWN_KEY_VALUE_LIST).stream() @@ -1320,7 +1301,7 @@ public void countryDropDownExcludesUnsupportedCountries_MigrationFlow() { PropertyModel editorModel = mAddressEditor.getEditorModelForTesting(); assertNotNull(editorModel); ListModel editorFields = editorModel.get(EDITOR_FIELDS); - assertEquals(13, editorFields.size()); + assertEquals(12, editorFields.size()); assertThat( editorFields.get(0).model.get(DROPDOWN_KEY_VALUE_LIST).stream() @@ -1349,7 +1330,7 @@ public void countryDropDownExcludesUnsupportedCountries_editExistingAccountProfi PropertyModel editorModel = mAddressEditor.getEditorModelForTesting(); assertNotNull(editorModel); ListModel editorFields = editorModel.get(EDITOR_FIELDS); - assertEquals(13, editorFields.size()); + assertEquals(12, editorFields.size()); assertThat( editorFields.get(0).model.get(DROPDOWN_KEY_VALUE_LIST).stream() @@ -1463,7 +1444,7 @@ public void edit_AccountAddressProfile_EmptyFieldsAreValidatedAfterSave() { assertNotNull(editorModel); ListModel model = editorModel.get(EDITOR_FIELDS); - assertEquals(13, model.size()); + assertEquals(12, model.size()); for (FieldItem item : model) { if (item.model.get(IS_REQUIRED)) { item.model.set(VALUE, ""); diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java index 78e1f6b8563ba0..aa43c2359ade1f 100644 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java @@ -183,8 +183,6 @@ private static MutableFlagWithSafeDefault newMutableFlagWithSafeDefault( "AutofillEnableRankingFormulaCreditCards"; public static final String AUTOFILL_ENABLE_SAVE_CARD_LOADING_AND_CONFIRMATION = "AutofillEnableSaveCardLoadingAndConfirmation"; - public static final String AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES = - "AutofillEnableSupportForHonorificPrefixes"; public static final String AUTOFILL_ENABLE_UPDATE_VIRTUAL_CARD_ENROLLMENT = "AutofillEnableUpdateVirtualCardEnrollment"; public static final String AUTOFILL_ENABLE_VIRTUAL_CARD_METADATA = diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd index 13a9da0adc5715..069a50dc0adee7 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -484,9 +484,6 @@ CHAR_LIMIT guidelines: Country/Region - - Title - Email diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_AUTOFILL_PROFILE_EDITOR_HONORIFIC_PREFIX.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_AUTOFILL_PROFILE_EDITOR_HONORIFIC_PREFIX.png.sha1 deleted file mode 100644 index ec67b29799e58b..00000000000000 --- a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_AUTOFILL_PROFILE_EDITOR_HONORIFIC_PREFIX.png.sha1 +++ /dev/null @@ -1 +0,0 @@ -4dcf597fed4da10035e80a4f22cf4a73b927a84e \ No newline at end of file