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

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestUseStatsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestUseStatsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestUseStatsTest.java
index 58ba0325a1cb2f35f2c35bcd151421ab52fba618..bd9393a78eb34d19f5fabc460828b63ed1f1367b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestUseStatsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestUseStatsTest.java
@@ -43,7 +43,7 @@ public class PaymentRequestUseStatsTest extends PaymentRequestTestBase {
                 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. */
@@ -68,7 +68,7 @@ public class PaymentRequestUseStatsTest extends PaymentRequestTestBase {
         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));
     }