[Payments] Normalize billing address before sending to the merchant.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestUseStatsTest.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.test.util.Feature;
@@ skipping 25 matching lines @@
         mHelper = new AutofillTestHelper();
         // The user has a shipping address and a credit card associated with that address on disk.
         mBillingAddressId = mHelper.setProfile(new AutofillProfile("", "https://example.com",
                 true, "Jon Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "",
                 "US", "555-555-5555", "", "en-US"));
         mCreditCardId = mHelper.setCreditCard(new CreditCard("", "https://example.com", true, true,
                 "Jon Doe", "4111111111111111", "1111", "12", "2050", "visa", R.drawable.pr_visa,
                 mBillingAddressId, "" /* serverId */));
         // Set specific use stats for the profile and credit card.
         mHelper.setProfileUseStatsForTesting(mBillingAddressId, 20, 5000);
-        mHelper.setCreditCardUseStatsForTesting(mCreditCardId, 10, 5000);
+        mHelper.setCreditCardUseStatsForTesting(mCreditCardId, 1, 5000);
     }
 
     /** Expect that using a profile and credit card to pay updates their usage stats. */
     @MediumTest
     @Feature({"Payments"})
     public void testLogProfileAndCreditCardUse() throws InterruptedException, ExecutionException,
             TimeoutException {
         triggerUIAndWait(mReadyToPay);
 
         // Get the current date value just before the start of the Payment Request.
         long timeBeforeRecord = mHelper.getCurrentDateForTesting();
 
         // Proceed with the payment.
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
         setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
         clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
 
         // Get the current date value just after the end of the Payment Request.
         long timeAfterRecord = mHelper.getCurrentDateForTesting();
 
         // Make sure the use counts were incremented and the use dates were set to the current time.
         assertEquals(21, mHelper.getProfileUseCountForTesting(mBillingAddressId));
         assertTrue(timeBeforeRecord <= mHelper.getProfileUseDateForTesting(mBillingAddressId));
         assertTrue(timeAfterRecord >= mHelper.getProfileUseDateForTesting(mBillingAddressId));
-        assertEquals(11, mHelper.getCreditCardUseCountForTesting(mCreditCardId));
+        assertEquals(2, mHelper.getCreditCardUseCountForTesting(mCreditCardId));

[please use gerrit instead, 2016/10/19 19:10:59]

What's the difference between going from 10 to 11 and 1 to 2 for use counts?

[sebsg, 2016/10/20 17:06:52]

That's what I was talking about offline. The difference is that setting 10 will
be overwritten by the refresh when normalizing the billing address of the card.
So it will be reset to 1. This is only a test problem though because setting a
use count like this never happens in prod. The goal of this test is to test the
RecordAndLogUse which is used in prod (only way to change the use count). For
this purpose, the test still works. The alternative would be saving the data to
disk in the tests, which we thought was not a good idea until we figure out what
happens with server cards and etc.

         assertTrue(timeBeforeRecord <= mHelper.getCreditCardUseDateForTesting(mCreditCardId));
         assertTrue(timeAfterRecord >= mHelper.getCreditCardUseDateForTesting(mCreditCardId));
     }
 }