[Payments] Normalize contact info phone# in PaymentResponse on Android.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestEmailAndPhoneTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestEmailAndPhoneTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestEmailAndPhoneTest.java
index 13abdbf1ae72c6a06653ff4829730f915c52ddd6..ecb9decef0f2a37bf35e95edeabddbea297aa035 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestEmailAndPhoneTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestEmailAndPhoneTest.java
@@ -30,12 +30,12 @@ public class PaymentRequestEmailAndPhoneTest extends PaymentRequestTestBase {
         AutofillTestHelper helper = new AutofillTestHelper();
         // The user has a valid email address and phone number on disk.
         helper.setProfile(new AutofillProfile("", "https://example.com", true, "Jon Doe", "Google",
-                "340 Main St", "CA", "Los Angeles", "", "90291", "", "US", "555-555-5555",
+                "340 Main St", "CA", "Los Angeles", "", "90291", "", "US", "5555555555",
                 "jon.doe@google.com", "en-US"));
 
         // Add the same profile but with a different address.
         helper.setProfile(new AutofillProfile("", "https://example.com", true, "", "Google",
-                "999 Main St", "CA", "Los Angeles", "", "90291", "", "US", "555-555-5555",
+                "999 Main St", "CA", "Los Angeles", "", "90291", "", "US", "5555555555",
                 "jon.doe@google.com", "en-US"));
 
         // Add the same profile but without a phone number.
@@ -45,12 +45,12 @@ public class PaymentRequestEmailAndPhoneTest extends PaymentRequestTestBase {
 
         // Add the same profile but without an email.
         helper.setProfile(new AutofillProfile("", "https://example.com", true, "Jon Doe", "Google",
-                "340 Main St", "CA", "Los Angeles", "", "90291", "", "US", "555-555-5555",
+                "340 Main St", "CA", "Los Angeles", "", "90291", "", "US", "5555555555",
                 "" /* emailAddress */, "en-US"));
 
         // Add the same profile but without a name.
         helper.setProfile(new AutofillProfile("" /* name */, "https://example.com", true, "",
-                "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US", "555-555-5555",
+                "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US", "5555555555",

[please use gerrit instead, 2017/04/04 18:28:22]

Why change the contents of the Autofill table?

[sebsg, 2017/04/04 19:55:57]

Done.

                 "jon.doe@google.com", "en-US"));
 
         installPaymentApp(HAVE_INSTRUMENTS, IMMEDIATE_RESPONSE);
@@ -62,7 +62,7 @@ public class PaymentRequestEmailAndPhoneTest extends PaymentRequestTestBase {
     public void testPay() throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickAndWait(R.id.button_primary, mDismissed);
-        expectResultContains(new String[] {"555-555-5555", "jon.doe@google.com"});
+        expectResultContains(new String[] {"+15555555555", "jon.doe@google.com"});
     }
 
     /** Attempt to add an invalid email address and phone number and cancel the transaction. */
@@ -89,10 +89,10 @@ public class PaymentRequestEmailAndPhoneTest extends PaymentRequestTestBase {
         clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);
         clickInContactInfoAndWait(R.id.payments_add_option_button, mReadyToEdit);
         setTextInEditorAndWait(
-                new String[] {"555-555-5555", "jane.jones@google.com"}, mEditorTextUpdate);
+                new String[] {"5555555555", "jane.jones@google.com"}, mEditorTextUpdate);
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);
         clickAndWait(R.id.button_primary, mDismissed);
-        expectResultContains(new String[] {"555-555-5555", "jane.jones@google.com"});
+        expectResultContains(new String[] {"+15555555555", "jane.jones@google.com"});
     }
 
     /**