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

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ContactEditor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ContactEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ContactEditor.java
index a9a11a03ba00ce84993c8bc1771e2498f9fec6a5..0ec3a51efef4600ab1cafd45f4fcfffcbfac0462 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ContactEditor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ContactEditor.java
@@ -12,6 +12,7 @@ import org.chromium.base.Callback;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
+import org.chromium.chrome.browser.autofill.PhoneNumberUtil;
 import org.chromium.chrome.browser.payments.ui.EditorFieldModel;
 import org.chromium.chrome.browser.payments.ui.EditorFieldModel.EditorFieldValidator;
 import org.chromium.chrome.browser.payments.ui.EditorModel;
@@ -152,7 +153,8 @@ public class ContactEditor extends EditorBase<AutofillContact> {
         final EditorFieldModel nameField = mRequestPayerName
                 ? EditorFieldModel.createTextInput(EditorFieldModel.INPUT_TYPE_HINT_PERSON_NAME,
                           mContext.getString(R.string.payments_name_field_in_contact_details),
-                          mPayerNames, null, null,
+                          mPayerNames, null /* suggestions */, null /* formatter */,
+                          null /* validator */,
                           mContext.getString(R.string.payments_field_required_validation_message),
                           null, contact.getPayerName())
                 : null;
@@ -160,7 +162,8 @@ public class ContactEditor extends EditorBase<AutofillContact> {
         final EditorFieldModel phoneField = mRequestPayerPhone
                 ? EditorFieldModel.createTextInput(EditorFieldModel.INPUT_TYPE_HINT_PHONE,
                           mContext.getString(R.string.autofill_profile_editor_phone_number),
-                          mPhoneNumbers, getPhoneValidator(), null,
+                          mPhoneNumbers, new PhoneNumberUtil.CountryAwareFormatTextWatcher(),
+                          getPhoneValidator(), null,
                           mContext.getString(R.string.payments_field_required_validation_message),
                           mContext.getString(R.string.payments_phone_invalid_validation_message),
                           contact.getPayerPhone())
@@ -169,7 +172,7 @@ public class ContactEditor extends EditorBase<AutofillContact> {
         final EditorFieldModel emailField = mRequestPayerEmail
                 ? EditorFieldModel.createTextInput(EditorFieldModel.INPUT_TYPE_HINT_EMAIL,
                           mContext.getString(R.string.autofill_profile_editor_email_address),
-                          mEmailAddresses, getEmailValidator(), null,
+                          mEmailAddresses, null, getEmailValidator(), null,
                           mContext.getString(R.string.payments_field_required_validation_message),
                           mContext.getString(R.string.payments_email_invalid_validation_message),
                           contact.getPayerEmail())