use user chosen country code to format and validate phone number for addresses.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments;
 
 import android.app.ProgressDialog;
 import android.os.Handler;
 import android.util.Pair;
 
@@ skipping 40 matching lines @@
     private boolean mAdminAreasLoaded;
     private String mRecentlySelectedCountry;
     private Runnable mCountryChangeCallback;
     private AutofillProfile mProfile;
     private EditorModel mEditor;
     private ProgressDialog mProgressDialog;
 
     /**
      * Adds the given phone number to the autocomplete set, if it's valid.
      *
      * @param phoneNumber The phone number to possibly add.

[gogerald1, 2017/06/15 17:41:35]

comments: @param countryCode .....

[wuandy1, 2017/06/19 15:11:14]

deleted

      */
-    public void addPhoneNumberIfValid(@Nullable CharSequence phoneNumber) {
-        if (getPhoneValidator().isValid(phoneNumber)) mPhoneNumbers.add(phoneNumber);
+    public void addPhoneNumberIfValid(
+            @Nullable CharSequence phoneNumber, @Nullable String countryCode) {

[gogerald1, 2017/06/15 17:41:35]

this countryCode doesn't take effect, since it may not be used in
getPhoneValidator

[wuandy1, 2017/06/19 15:11:14]

removed validation.

+        if (getPhoneValidator(countryCode).isValid(phoneNumber)) mPhoneNumbers.add(phoneNumber);
     }
 
     /**
      * Builds and shows an editor model with the following fields.
      *
      * [ country dropdown   ] <----- country dropdown is always present.
      * [ an address field   ] \
      * [ an address field   ]  \
      *         ...               <-- field order, presence, required, and labels depend on country.
      * [ an address field   ]  /
@@ skipping 41 matching lines @@
              * If the selected country on the country dropdown list is changed,
              * the first element of eventData is the recently selected dropdown key,
              * the second element is the callback to invoke for when the dropdown
              * change has been processed.
              */
             @Override
             public void onResult(Pair<String, Runnable> eventData) {
                 mEditor.removeAllFields();
                 showProgressDialog();
                 mRecentlySelectedCountry = eventData.first;
+                mEditorDialog.updateCountryOfPhoneFormatter(mRecentlySelectedCountry);

[gogerald1, 2017/06/15 17:41:35]

This not enough as I mentioned in the last review. onResult is called only after
user manually changed selected country. However, we set default selected country
when creating the editor dialog (line 135).

[wuandy1, 2017/06/19 15:11:14]

add code to initialize it, not sure this is what you meant though.

                 mCountryChangeCallback = eventData.second;
                 loadAdminAreasForCountry(mRecentlySelectedCountry);
             }
         });
 
         // Country dropdown is cached, so the selected item needs to be updated for the new profile
         // that's being edited. This will not fire the dropdown callback.
         mCountryField.setValue(AutofillAddress.getCountryCode(mProfile));
 
         // There's a finite number of fields for address editing. Changing the country will re-order
@@ skipping 18 matching lines @@
             // Android has special formatting rules for names.
             mAddressFields.put(AddressField.RECIPIENT, EditorFieldModel.createTextInput(
                     EditorFieldModel.INPUT_TYPE_HINT_PERSON_NAME));
         }
 
 
         // Phone number is present and required for all countries.
         if (mPhoneField == null) {
             mPhoneField = EditorFieldModel.createTextInput(EditorFieldModel.INPUT_TYPE_HINT_PHONE,
                     mContext.getString(R.string.autofill_profile_editor_phone_number),
-                    mPhoneNumbers, getPhoneValidator(), null,
+                    mPhoneNumbers, getPhoneValidator(null), null,

[gogerald1, 2017/06/15 17:41:35]

mCountryField.getValue()? since we have set default country code above (line
135).

[wuandy1, 2017/06/19 15:11:14]

Done.

                     mContext.getString(R.string.payments_field_required_validation_message),
                     mContext.getString(R.string.payments_phone_invalid_validation_message), null);
         }
 
         // Phone number field is cached, so its value needs to be updated for every new profile
         // that's being edited.
         mPhoneField.setValue(mProfile.getPhoneNumber());
 
         // If the user clicks [Cancel], send |toEdit| address back to the caller, which was the
         // original state (could be null, a complete address, a partial address).
@@ skipping 208 matching lines @@
                         R.string.payments_field_required_validation_message));
             } else {
                 field.setRequiredErrorMessage(null);
             }
             mEditor.addField(field);
         }
         // Phone number must be the last field.
         mEditor.addField(mPhoneField);
     }
 
-    private EditorFieldValidator getPhoneValidator() {
+    private EditorFieldValidator getPhoneValidator(@Nullable final String countryCode) {
         if (mPhoneValidator == null) {

[gogerald1, 2017/06/15 17:41:35]

This makes the countryCode of mPhoneValidator is fixed after created, 

[wuandy1, 2017/06/19 15:11:14]

Done.

             mPhoneValidator = new EditorFieldValidator() {
                 @Override
                 public boolean isValid(@Nullable CharSequence value) {
-                    return value != null && PhoneNumberUtil.isValidNumber(value.toString());
+                    String countryToValidateAgainst = countryCode != null
+                            ? countryCode
+                            : (mCountryField == null ? null : mCountryField.getValue().toString());
+                    return value != null
+                            && PhoneNumberUtil.isValidNumber(
+                                       value.toString(), countryToValidateAgainst);
                 }
 
                 @Override
                 public boolean isLengthMaximum(@Nullable CharSequence value) {
                     return false;
                 }
             };
         }
         return mPhoneValidator;
     }
 }