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

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.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.support.test.filters.MediumTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.metrics.RecordHistogram;
@@ skipping 45 matching lines @@
 
         installPaymentApp(HAVE_INSTRUMENTS, IMMEDIATE_RESPONSE);
     }
 
     /** Provide the existing valid payer name, phone number and email address to the merchant. */
     @MediumTest
     @Feature({"Payments"})
     public void testPay() throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickAndWait(R.id.button_primary, mDismissed);
-        expectResultContains(new String[] {"Jon Doe", "555-555-5555", "jon.doe@google.com"});
+        expectResultContains(new String[] {"Jon Doe", "+15555555555", "jon.doe@google.com"});
     }
 
     /** Attempt to add invalid contact information and cancel the transaction. */
     @MediumTest
     @Feature({"Payments"})
     public void testAddInvalidContactAndCancel()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);
         clickInContactInfoAndWait(R.id.payments_add_option_button, mReadyToEdit);
@@ skipping 10 matching lines @@
     public void testAddContactAndPay()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);
         clickInContactInfoAndWait(R.id.payments_add_option_button, mReadyToEdit);
         setTextInEditorAndWait(new String[] {"Jane Jones", "999-999-9999", "jane.jones@google.com"},
                 mEditorTextUpdate);
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);
 
         clickAndWait(R.id.button_primary, mDismissed);
-        expectResultContains(new String[] {"Jane Jones", "999-999-9999", "jane.jones@google.com"});
+        expectResultContains(new String[] {"Jane Jones", "+19999999999", "jane.jones@google.com"});
     }
 
     /** Quickly pressing on "add contact info" and then [X] should not crash. */
     @MediumTest
     @Feature({"Payments"})
     public void testQuickAddContactAndCloseShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);
 
@@ skipping 147 matching lines @@
         // Make sure that only the appropriate enum value was logged.
         for (int i = 0; i < PaymentRequestMetrics.REQUESTED_INFORMATION_MAX; ++i) {
             assertEquals((i == (PaymentRequestMetrics.REQUESTED_INFORMATION_EMAIL
                     | PaymentRequestMetrics.REQUESTED_INFORMATION_PHONE
                     | PaymentRequestMetrics.REQUESTED_INFORMATION_NAME) ? 1 : 0),
                     RecordHistogram.getHistogramValueCountForTesting(
                             "PaymentRequest.RequestedInformation", i));
         }
     }
 }