Revamp desktop Autofill settings, round 2

components/autofill/core/browser/credit_card.cc

Index: components/autofill/core/browser/credit_card.cc
diff --git a/components/autofill/core/browser/credit_card.cc b/components/autofill/core/browser/credit_card.cc
index f75dc8e5e6f18a1f28f0c6a13f0807557329e07d..68db80017374b6cad7fe130db03c89b01b260840 100644
--- a/components/autofill/core/browser/credit_card.cc
+++ b/components/autofill/core/browser/credit_card.cc
@@ -467,23 +467,29 @@ void CreditCard::GetMatchingTypes(const base::string16& text,
 }
 
 const base::string16 CreditCard::Label() const {
+  std::pair<base::string16, base::string16> pieces = LabelPieces();
+  return pieces.first + pieces.second;
+}
+
+const std::pair<base::string16, base::string16> CreditCard::LabelPieces()
+    const {
   base::string16 label;
+  // No CC number, return name only.
   if (number().empty())
-    return name_on_card_;  // No CC number, return name only.
+    return std::make_pair(name_on_card_, base::string16());
 
   base::string16 obfuscated_cc_number = TypeAndLastFourDigits();
+  // No expiration date set.
   if (!expiration_month_ || !expiration_year_)
-    return obfuscated_cc_number;  // No expiration date set.
+    return std::make_pair(obfuscated_cc_number, base::string16());
 
-  // TODO(georgey): Internationalize date.
   base::string16 formatted_date(ExpirationMonthAsString());
   formatted_date.append(base::ASCIIToUTF16("/"));
   formatted_date.append(Expiration4DigitYearAsString());
 
-  label = l10n_util::GetStringFUTF16(IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT,
-                                     obfuscated_cc_number,
-                                     formatted_date);
-  return label;
+  base::string16 separator =
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR);
+  return std::make_pair(obfuscated_cc_number, separator + formatted_date);
 }
 
 void CreditCard::SetInfoForMonthInputType(const base::string16& value) {