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

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.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.Context;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.JsonWriter;
@@ skipping 76 matching lines @@
 
         // Start to get the full card details.
         PersonalDataManager.getInstance().getFullCard(mWebContents, mCard, this);
     }
 
     @Override
     public void onFullCardDetails(CreditCard updatedCard, String cvc) {
         // 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());
 
         mIsWaitingForFullCardDetails = false;
 
         // Show the loading UI while the address gets normalized.
         mCallback.loadingInstrumentDetails();
 
         // Wait for the billing address normalization before sending the instrument details.
@@ skipping 177 matching lines @@
     /** @return The credit card represented by this payment instrument. */
     public CreditCard getCard() {
         return mCard;
     }
 
     /** @return The billing address associated with this credit card. */
     public AutofillProfile getBillingAddress() {
         return mBillingAddress;
     }
 }