[Payments] Show name and address when selecting a CC billing address.

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.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
@@ skipping 352 matching lines @@
         // 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_NONE ? 1 : 0),
                     RecordHistogram.getHistogramValueCountForTesting(
                             "PaymentRequest.RequestedInformation", i));
         }
     }
+
+    /** Verifies the format of the billing address suggestions when adding a new credit card. */
+    @MediumTest
+    public void testNewCardBillingAddressFormat()
+            throws InterruptedException, ExecutionException, TimeoutException {
+        fillNewCardForm("5454-5454-5454-5454", "Bob", DECEMBER, NEXT_YEAR, FIRST_BILLING_ADDRESS);
+        assertTrue(getSpinnerSelectionTextInCardEditor(2).equals(
+                "Jon Doe, Google, 340 Main St, Los Angeles, CA 90291, United States"));
+    }
 }