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

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteContactDetailsAndFreeShippingTest.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.test.util.Feature;
 import org.chromium.chrome.R;
@@ skipping 46 matching lines @@
                 "CA", "90291", "650-253-0000"}, mEditorTextUpdate);
         // The contact is now complete, but not selected.
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyForInput);
         // We select it.
         clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);
         assertEquals("Jon Doe\n+1 650-253-0000\njon.doe@google.com",
                 getContactDetailsSuggestionLabel(0));
         clickInContactInfoAndWait(R.id.payments_first_radio_button, mReadyToPay);
 
         clickAndWait(R.id.button_primary, mDismissed);
-        expectResultContains(new String[] {"Jon Doe", "+1 650-253-0000", "jon.doe@google.com"});
+        expectResultContains(new String[] {"Jon Doe", "+16502530000", "jon.doe@google.com"});
     }
 
     /** Add a shipping address with valid data and see that the contacts section is updated. */
     @MediumTest
     @Feature({"Payments"})
     public void testEditIncompleteShippingAndContactAndPay()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyForInput);
         clickInShippingSummaryAndWait(R.id.payments_section, mReadyForInput);
 
@@ skipping 12 matching lines @@
                 "Jane Doe\n+1 650-253-0000\nEmail required", getContactDetailsSuggestionLabel(1));
 
         // Now edit the first contact and pay.
         clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);
         clickInContactInfoAndWait(R.id.payments_first_radio_button, mReadyToEdit);
         setTextInEditorAndWait(
                 new String[] {"Jon Doe", "650-253-0000", "jon.doe@google.com"}, mEditorTextUpdate);
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);
 
         clickAndWait(R.id.button_primary, mDismissed);
-        expectResultContains(new String[] {"Jon Doe", "+1 650-253-0000", "jon.doe@google.com"});
+        expectResultContains(new String[] {"Jon Doe", "+16502530000", "jon.doe@google.com"});
     }
 }