[Payments] Format shipping and billing phone number in normalizer.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsAndFreeShippingTest.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.content.DialogInterface;
 import android.support.test.filters.MediumTest;
 
 import org.chromium.base.metrics.RecordHistogram;
@@ skipping 35 matching lines @@
      * Submit the payer name, email address, phone number and shipping address to the merchant when
      * the user clicks "Pay."
      */
     @MediumTest
     @Feature({"Payments"})
     public void testPay() throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
         setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
         clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
-        expectResultContains(new String[] {"Jon Doe", "jon.doe@google.com", "555-555-5555",
+        expectResultContains(new String[] {"Jon Doe", "jon.doe@google.com", "+15555555555",
                 "Jon Doe", "4111111111111111", "12", "2050", "visa", "123", "Google", "340 Main St",
                 "CA", "Los Angeles", "90291", "US", "en", "freeShippingOption"});
     }
 
     /**
      * Test that starting a payment request that requires an email address, a phone number a name
      * and a shipping address results in the appropriate metric being logged in the
      * PaymentRequest.RequestedInformation histogram.
      */
     @MediumTest
     @Feature({"Payments"})
     public void testRequestedInformationMetric() throws InterruptedException, ExecutionException,
             TimeoutException {
         // Start the Payment Request.
         triggerUIAndWait(mReadyToPay);
 
         // 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_SHIPPING
                     | PaymentRequestMetrics.REQUESTED_INFORMATION_NAME) ? 1 : 0),
                     RecordHistogram.getHistogramValueCountForTesting(
                             "PaymentRequest.RequestedInformation", i));
         }
     }
 }