[Payments] Add information requested by merchant metrics to PR.

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/PaymentRequestContactDetailsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java
index 9c25c1c9cc681f5b7ea4abe11aada72dab096229..25741c693a82c40c3cb1b754b822064702d4747d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java
@@ -8,6 +8,7 @@ import android.content.DialogInterface;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.AutofillTestHelper;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
@@ -169,4 +170,27 @@ public class PaymentRequestContactDetailsTest extends PaymentRequestTestBase {
 
         expectResultContains(new String[] {"Request cancelled"});
     }
+
+    /**
+     * Test that starting a payment request that requires the user's email address and phone number
+     * results in the appropriate metric being logged in the PaymentRequest.RequestedInformation
+     * histogram.
+     */
+    @MediumTest
+    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) {
+            if (i == PaymentRequestMetrics.REQUESTED_INFORMATION_EMAIL_PHONE) {
+                assertEquals(1, RecordHistogram.getHistogramValueCountForTesting(

[please use gerrit instead, 2016/07/27 16:24:40]

Here and elsewhere, save a few lines like this:

PaymentRequestMetrics.REQUESTED_INFORMATION_EMAIL_PHONE));
for (int i = 0; i < PaymentRequestMetrics.REQUESTED_INFORMATION_MAX; ++i) {
  assertEquals((i == PaymentRequestMetrics.REQUESTED_INFORMATION_EMAIL_PHONE ? 1
: 0),
           RecordHistogram.getHistogramValueCountForTesting(
                   "PaymentRequest.RequestedInformation", i));
}

(Indents might be different.)

[sebsg, 2016/07/27 17:26:01]

Done.

+                        "PaymentRequest.RequestedInformation", i));
+            } else {
+                assertEquals(0, RecordHistogram.getHistogramValueCountForTesting(
+                        "PaymentRequest.RequestedInformation", i));
+            }
+        }
+    }
 }