[Payments] Format and validate phone number according to selected country in address editor

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
index 281c0fb4a97a4d32f719431d18dd8e8cbf05acff..d092ca718538fa3c587ba5486edcfb093e03b739 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
@@ -485,11 +485,12 @@ public class CardEditor extends EditorBase<AutofillPaymentInstrument>
         if (mNumberField == null) {
             mNumberField = EditorFieldModel.createTextInput(
                     EditorFieldModel.INPUT_TYPE_HINT_CREDIT_CARD,
-                    mContext.getString(R.string.autofill_credit_card_editor_number), null,
-                    mCardNumberValidator, mCardIconGenerator,
+                    mContext.getString(R.string.autofill_credit_card_editor_number),
+                    null /* suggestions */, null /* formatter */, mCardNumberValidator,
+                    mCardIconGenerator,
                     mContext.getString(R.string.payments_field_required_validation_message),
                     mContext.getString(R.string.payments_card_number_invalid_validation_message),
-                    null);
+                    null /* value */);
             if (mCanScan) {
                 mNumberField.addActionIcon(R.drawable.ic_photo_camera,
                         R.string.autofill_scan_credit_card, new Runnable() {
@@ -507,11 +508,13 @@ public class CardEditor extends EditorBase<AutofillPaymentInstrument>
 
         // Name on card is required.
         if (mNameField == null) {
-            mNameField = EditorFieldModel.createTextInput(
-                    EditorFieldModel.INPUT_TYPE_HINT_PERSON_NAME,
-                    mContext.getString(R.string.autofill_credit_card_editor_name), null, null, null,
-                    mContext.getString(R.string.payments_field_required_validation_message), null,
-                    null);
+            mNameField =
+                    EditorFieldModel.createTextInput(EditorFieldModel.INPUT_TYPE_HINT_PERSON_NAME,
+                            mContext.getString(R.string.autofill_credit_card_editor_name),
+                            null /* suggestions */, null /* formatter */, null /* validator */,
+                            null /* valueIconGenerator */,
+                            mContext.getString(R.string.payments_field_required_validation_message),
+                            null /* invalidErrorMessage */, null /* value */);
         }
         mNameField.setValue(card.getName());
         editor.addField(mNameField);