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

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.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.os.Build;
 import android.support.test.filters.MediumTest;
 
@@ skipping 173 matching lines @@
 
         setTextInEditorAndWait(new String[] {"Bob", "Google", "1600 Amphitheatre Pkwy",
                 "Mountain View", "CA", "94043", "650-253-0000"}, mEditorTextUpdate);
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToEdit);
 
         clickInCardEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
         setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
         clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
         expectResultContains(new String[] {"5454545454545454", "12", "Bob", "Google",
-                "1600 Amphitheatre Pkwy", "Mountain View", "CA", "94043", "+1 650-253-0000"});
+                "1600 Amphitheatre Pkwy", "Mountain View", "CA", "94043", "+16502530000"});
     }
 
     /** Quickly pressing on "add card" and then [X] should not crash. */
     @MediumTest
     @Feature({"Payments"})
     public void testQuickAddCardAndCloseShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickInPaymentMethodAndWait(R.id.payments_section, mReadyForInput);
 
@@ skipping 170 matching lines @@
         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_NONE ? 1 : 0),
                     RecordHistogram.getHistogramValueCountForTesting(
                             "PaymentRequest.RequestedInformation", i));
         }
     }
 }