[Payments] Format and validate phone number by using libphonenumber

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressTest.java
index cd6bc101601cb90fe862432ec0fe96444d3fc0e1..5015d36aae42e93e026b19562c003cf0e3d4b821 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressTest.java
@@ -38,21 +38,21 @@ public class PaymentRequestBillingAddressTest extends PaymentRequestTestBase {
         AutofillTestHelper helper = new AutofillTestHelper();
         String profile1 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
                 "Jon Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US",
-                "310-310-6000", "jon.doe@gmail.com", "en-US"));
+                "650-253-0000", "jon.doe@gmail.com", "en-US"));
         helper.setCreditCard(new CreditCard("", "https://example.com", true, true, "Jon Doe",
                 "4111111111111111", "1111", "12", "2050", "visa", R.drawable.pr_visa, profile1,
                 "" /* serverId */));
         String profile2 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
                 "Rob Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US",
-                "310-310-6000", "jon.doe@gmail.com", "en-US"));
+                "650-253-0000", "jon.doe@gmail.com", "en-US"));
         String profile3 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
                 "Tom Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US",
-                "310-310-6000", "jon.doe@gmail.com", "en-US"));
+                "650-253-0000", "jon.doe@gmail.com", "en-US"));
 
         // Incomplete profile (invalid address).
         String profile4 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
                 "Bart Doe", "Google", "340 Main St", "CA", "", "", "90291", "", "US",
-                "310-310-6000", "jon.doe@gmail.com", "en-US"));
+                "650-253-0000", "jon.doe@gmail.com", "en-US"));
 
         // Incomplete profile (missing phone number)
         String profile5 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
@@ -61,7 +61,7 @@ public class PaymentRequestBillingAddressTest extends PaymentRequestTestBase {
 
         // Incomplete profile (missing recipient).
         String profile6 = helper.setProfile(new AutofillProfile("", "https://example.com", true, "",
-                "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US", "310-310-6000",
+                "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US", "650-253-0000",
                 "jon.doe@gmail.com", "en-US"));
 
         // Incomplete profile (need more information).
@@ -71,7 +71,7 @@ public class PaymentRequestBillingAddressTest extends PaymentRequestTestBase {
         // Profile with empty street address (should not be presented to user).
         String profile8 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
                 "Jerry Doe", "Google", "" /* streetAddress */, "CA", "Los Angeles", "", "90291", "",
-                "US", "310-310-6000", "jerry.doe@gmail.com", "en-US"));
+                "US", "650-253-0000", "jerry.doe@gmail.com", "en-US"));
 
         // This card has no billing address selected.
         helper.setCreditCard(new CreditCard("", "https://example.com", true, true, "Jane Doe",
@@ -251,7 +251,7 @@ public class PaymentRequestBillingAddressTest extends PaymentRequestTestBase {
         setSpinnerSelectionsInCardEditorAndWait(
                 new int[] {DECEMBER, NEXT_YEAR, ADD_BILLING_ADDRESS}, mReadyToEdit);
         setTextInEditorAndWait(new String[] {"Seb Doe", "Google", "340 Main St", "Los Angeles",
-                "CA", "90291", "999-999-9999"}, mEditorTextUpdate);
+                "CA", "90291", "650-253-0000"}, mEditorTextUpdate);
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToEdit);
 
         // There should be 9 suggestions, the 7 initial addresses, the newly added address and the
@@ -287,7 +287,7 @@ public class PaymentRequestBillingAddressTest extends PaymentRequestTestBase {
         clickInShippingSummaryAndWait(R.id.payments_section, mReadyForInput);
         clickInShippingAddressAndWait(R.id.payments_add_option_button, mReadyToEdit);
         setTextInEditorAndWait(new String[] {"Seb Doe", "Google", "340 Main St", "Los Angeles",
-                "CA", "90291", "999-999-9999"}, mEditorTextUpdate);
+                "CA", "90291", "650-253-0000"}, mEditorTextUpdate);
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);
 
         // Navigate to the card editor UI.
@@ -328,7 +328,7 @@ public class PaymentRequestBillingAddressTest extends PaymentRequestTestBase {
         // editor.
         setSpinnerSelectionsInCardEditorAndWait(new int[] {DECEMBER, NEXT_YEAR, 4}, mReadyToEdit);
         setTextInEditorAndWait(new String[] {"Lisa Doh", "Google", "340 Main St", "Los Angeles",
-                "CA", "90291", "999-999-9999"}, mEditorTextUpdate);
+                "CA", "90291", "650-253-0000"}, mEditorTextUpdate);
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToEdit);
 
         // The newly completed address must be selected and put at the top of the dropdown.