[Merge M-56] Pass the full card number to merchant after unmask.

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
index 6013fa5ec918f80fde423c2fec88b6ff3827ee20..00c6f5950231f49f46374efc6ceedea807fd6488 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
@@ -94,6 +94,10 @@ public class AutofillPaymentInstrument extends PaymentInstrument
         // Keep the cvc for after the normalization.
         mSecurityCode = cvc;
 
+        // The card number changes for unmasked cards.
+        assert updatedCard.getNumber().length() > 4;
+        mCard.setNumber(updatedCard.getNumber());
+
         // Update the card's expiration date.
         mCard.setMonth(updatedCard.getMonth());
         mCard.setYear(updatedCard.getYear());