[Payments] Fix the Payment Request histogram check failure in tests.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestJourneyLoggerTest.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.metrics.RecordHistogram;
@@ skipping 281 matching lines @@
                 0, RecordHistogram.getHistogramValueCountForTesting(
                            "PaymentRequest.NumberOfSuggestionsShown.ContactInfo.Completed", 2));
         assertEquals(0, RecordHistogram.getHistogramValueCountForTesting(
                                 "PaymentRequest.NumberOfSelectionAdds.ContactInfo.Completed", 0));
         assertEquals(
                 0, RecordHistogram.getHistogramValueCountForTesting(
                            "PaymentRequest.NumberOfSelectionChanges.ContactInfo.Completed", 0));
         assertEquals(0, RecordHistogram.getHistogramValueCountForTesting(
                                 "PaymentRequest.NumberOfSelectionEdits.ContactInfo.Completed", 0));
     }
+
+    /**
+     * Expect that that the journey metrics are logged correctly on a second consecutive payment
+     * request.
+     */
+    @MediumTest
+    @Feature({"Payments"})
+    public void testTwoTimes() throws InterruptedException, ExecutionException, TimeoutException {
+        // Complete a Payment Request with a credit card.
+        triggerUIAndWait("ccBuy", mReadyToPay);
+        clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
+        setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
+        clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
+
+        // Make sure the right number of suggestions were logged.
+        assertEquals(
+                1, RecordHistogram.getHistogramValueCountForTesting(
+                           "PaymentRequest.NumberOfSuggestionsShown.ShippingAddress.Completed", 2));
+
+        // Make sure no adds, edits or changes were logged.
+        assertEquals(
+                1, RecordHistogram.getHistogramValueCountForTesting(
+                           "PaymentRequest.NumberOfSelectionAdds.ShippingAddress.Completed", 0));
+        assertEquals(
+                1, RecordHistogram.getHistogramValueCountForTesting(
+                           "PaymentRequest.NumberOfSelectionChanges.ShippingAddress.Completed", 0));
+        assertEquals(
+                1, RecordHistogram.getHistogramValueCountForTesting(
+                           "PaymentRequest.NumberOfSelectionEdits.ShippingAddress.Completed", 0));
+
+        // Complete a second Payment Request with a credit card.
+        reTriggerUIAndWait("ccBuy", mReadyToPay);
+        clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
+        setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
+        clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
+
+        // Make sure the right number of suggestions were logged.
+        assertEquals(
+                2, RecordHistogram.getHistogramValueCountForTesting(
+                           "PaymentRequest.NumberOfSuggestionsShown.ShippingAddress.Completed", 2));
+
+        // Make sure no adds, edits or changes were logged.
+        assertEquals(
+                2, RecordHistogram.getHistogramValueCountForTesting(
+                           "PaymentRequest.NumberOfSelectionAdds.ShippingAddress.Completed", 0));
+        assertEquals(
+                2, RecordHistogram.getHistogramValueCountForTesting(
+                           "PaymentRequest.NumberOfSelectionChanges.ShippingAddress.Completed", 0));
+        assertEquals(
+                2, RecordHistogram.getHistogramValueCountForTesting(
+                           "PaymentRequest.NumberOfSelectionEdits.ShippingAddress.Completed", 0));
+    }
 }