Credit card editor for PaymentRequest UI.

chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
index e895591f636ae9ef68bdc462639e41709608af2d..ffa56cfa8f86ee7c79c0a6a114b1e92aef631f3e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
@@ -108,7 +108,7 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
 
         // The country dropdown is always present on the editor.
         if (mCountryField == null) {
-            mCountryField = new EditorFieldModel(
+            mCountryField = EditorFieldModel.createDropdown(
                     mContext.getString(R.string.autofill_profile_editor_country),
                     AutofillProfileBridge.getSupportedCountries());
         }
@@ -139,28 +139,29 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
         // and relabel the fields. The meaning of each field remains the same.
         if (mAddressFields.isEmpty()) {
             // City, dependent locality, and organization don't have any special formatting hints.
-            mAddressFields.put(AddressField.LOCALITY, new EditorFieldModel(0));
-            mAddressFields.put(AddressField.DEPENDENT_LOCALITY, new EditorFieldModel(0));
-            mAddressFields.put(AddressField.ORGANIZATION, new EditorFieldModel(0));
+            mAddressFields.put(AddressField.LOCALITY, EditorFieldModel.createTextInput(0));
+            mAddressFields.put(AddressField.DEPENDENT_LOCALITY,
+                    EditorFieldModel.createTextInput(0));
+            mAddressFields.put(AddressField.ORGANIZATION, EditorFieldModel.createTextInput(0));
 
             // State should be formatted in all capitals.
-            mAddressFields.put(AddressField.ADMIN_AREA,
-                    new EditorFieldModel(EditorFieldModel.INPUT_TYPE_HINT_REGION));
+            mAddressFields.put(AddressField.ADMIN_AREA, EditorFieldModel.createTextInput(
+                        EditorFieldModel.INPUT_TYPE_HINT_REGION));
 
             // Sorting code and postal code (a.k.a. ZIP code) should show both letters and digits on
             // the keyboard, if possible.
-            mAddressFields.put(AddressField.SORTING_CODE,
-                    new EditorFieldModel(EditorFieldModel.INPUT_TYPE_HINT_ALPHA_NUMERIC));
-            mAddressFields.put(AddressField.POSTAL_CODE,
-                    new EditorFieldModel(EditorFieldModel.INPUT_TYPE_HINT_ALPHA_NUMERIC));
+            mAddressFields.put(AddressField.SORTING_CODE, EditorFieldModel.createTextInput(
+                    EditorFieldModel.INPUT_TYPE_HINT_ALPHA_NUMERIC));
+            mAddressFields.put(AddressField.POSTAL_CODE, EditorFieldModel.createTextInput(
+                    EditorFieldModel.INPUT_TYPE_HINT_ALPHA_NUMERIC));
 
             // Street line field can contain \n to indicate line breaks.
-            mAddressFields.put(AddressField.STREET_ADDRESS,
-                    new EditorFieldModel(EditorFieldModel.INPUT_TYPE_HINT_STREET_LINES));
+            mAddressFields.put(AddressField.STREET_ADDRESS, EditorFieldModel.createTextInput(
+                    EditorFieldModel.INPUT_TYPE_HINT_STREET_LINES));
 
             // Android has special formatting rules for names.
-            mAddressFields.put(AddressField.RECIPIENT,
-                    new EditorFieldModel(EditorFieldModel.INPUT_TYPE_HINT_PERSON_NAME));
+            mAddressFields.put(AddressField.RECIPIENT, EditorFieldModel.createTextInput(
+                    EditorFieldModel.INPUT_TYPE_HINT_PERSON_NAME));
         }
 
         // Address fields are cached, so their values need to be updated for every new profile
@@ -177,7 +178,7 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
 
         // Phone number is present and required for all countries.
         if (mPhoneField == null) {
-            mPhoneField = new EditorFieldModel(EditorFieldModel.INPUT_TYPE_HINT_PHONE,
+            mPhoneField = EditorFieldModel.createTextInput(EditorFieldModel.INPUT_TYPE_HINT_PHONE,
                     mContext.getString(R.string.autofill_profile_editor_phone_number),
                     mPhoneNumbers, getPhoneValidator(),
                     mContext.getString(R.string.payments_address_field_required_validation_message),
@@ -241,11 +242,11 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
 
         // Calculate the label for this profile. The label's format depends on the country and
         // language code for the profile.
-        PersonalDataManager pmd = PersonalDataManager.getInstance();
-        profile.setLabel(pmd.getGetAddressLabelForPaymentRequest(profile));
+        PersonalDataManager pdm = PersonalDataManager.getInstance();
+        profile.setLabel(pdm.getAddressLabelForPaymentRequest(profile));
 
         // Save the edited autofill profile.
-        pmd.setProfile(profile);
+        profile.setGUID(pdm.setProfile(profile));
     }
 
     /** @return The given autofill profile field. */