Phone and email selection UI for PaymentRequest

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java
similarity index 75%
copy from chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
copy to chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java
index 7dd481f0b5bf44bb9f32848e6662dae3fcd9aabc..2820aae6166e1bd1776374b474bc6e872466197b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java
@@ -16,11 +16,11 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 /**
- * A payment integration test for a merchant that provides free shipping regardless of address.
+ * A payment integration test for a merchant that requests contact details.
  */
-public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
-    public PaymentRequestFreeShippingTest() {
-        super("payment_request_free_shipping_test.html");
+public class PaymentRequestContactDetailsTest extends PaymentRequestTestBase {
+    public PaymentRequestContactDetailsTest() {
+        super("payment_request_contact_details_test.html");
     }
 
     @Override
@@ -28,7 +28,8 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
             throws InterruptedException, ExecutionException, TimeoutException {
         AutofillTestHelper helper = new AutofillTestHelper();
         helper.setProfile(new AutofillProfile("", "https://example.com", true, "Jon Doe", "Google",
-                "340 Main St", "CA", "Los Angeles", "", "90291", "", "US", "", "", "en-US"));
+                "340 Main St", "CA", "Los Angeles", "", "90291", "", "US", "555-555-5555",
+                "jon.doe@google.com", "en-US"));
         helper.setCreditCard(new CreditCard("", "https://example.com", true, true, "Jon Doe",
                 "4111111111111111", "1111", "12", "2050", "visa", R.drawable.pr_visa));
     }
@@ -41,8 +42,6 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
                 mReadyForUnmaskInput.getTarget(), mReadyToUnmask);
         clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE,
                 mReadyToUnmask.getTarget(), mDismissed);
-        expectResultContains(new String[] {"Jon Doe", "4111111111111111", "12", "2050", "visa",
-                "123", "Google", "340 Main St", "CA", "Los Angeles", "90291", "US", "en",
-                "freeShippingOption", "USD", "5.00"});
+        expectResultContains(new String[] {"555-555-5555", "jon.doe@google.com"});
     }
 }