Add card details and legal message to Android save credit card infobar.

components/autofill/core/browser/credit_card.h

Index: components/autofill/core/browser/credit_card.h
diff --git a/components/autofill/core/browser/credit_card.h b/components/autofill/core/browser/credit_card.h
index cb2ab21ed32858657d6570027f10f429b475c813..65c8f20a91076845739f1ab375f72fbea517a4d8 100644
--- a/components/autofill/core/browser/credit_card.h
+++ b/components/autofill/core/browser/credit_card.h
@@ -63,6 +63,7 @@ class CreditCard : public AutofillDataModel {
 
 // This method is not compiled on iOS because the resources are not used and
 // should not be shipped.
+// TODO(rouslan): Use credit card issuer images on iOS. http://crbug.com/535784
 #if !defined(OS_IOS)
   // The ResourceBundle ID for the appropriate credit card image.
   static int IconResourceId(const std::string& type);
@@ -108,10 +109,15 @@ class CreditCard : public AutofillDataModel {
   // The last four digits of the credit card number (or possibly less if there
   // aren't enough characters).
   base::string16 LastFourDigits() const;
+  // The last four digits of the credit card formatted for display as '***2345'.
+  base::string16 LastFourDigitsForDisplay() const;

[Evan Stade, 2016/01/08 03:14:12]

Can you leave these functions alone and just prepend the midline ellipsis to
LastFourDigits in the (2) places you want it?

[please use gerrit instead, 2016/01/12 00:47:26]

Done.

   // The user-visible type of the card, e.g. 'Mastercard'.
   base::string16 TypeForDisplay() const;
-  // A label for this credit card formatted as 'Cardname - 2345'.
-  base::string16 TypeAndLastFourDigits() const;
+  // A label for this credit card formatted as 'IssuerName ***2345'.

[Evan Stade, 2016/01/08 03:14:12]

asterisk is not correct

[please use gerrit instead, 2016/01/12 00:47:26]

Done.

+  base::string16 TypeAndLastFourDigitsForDisplay() const;
+
+  // The expiration for this credit card formatted as 'Exp: 06/17'.
+  base::string16 AbbreviatedExpirationDateForDisplay() const;
 
   const std::string& type() const { return type_; }