Revamp desktop Autofill settings, round 2

components/autofill/core/browser/credit_card.cc

 // Copyright 2013 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.
 
 #include "components/autofill/core/browser/credit_card.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <ostream>
@@ skipping 449 matching lines @@
     matching_types->insert(CREDIT_CARD_NUMBER);
 
   int month;
   if (ConvertMonth(text, app_locale, &month) && month != 0 &&
       month == expiration_month_) {
     matching_types->insert(CREDIT_CARD_EXP_MONTH);
   }
 }
 
 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) {
   // Check if |text| is "yyyy-mm" format first, and check normal month format.
   if (!autofill::MatchesPattern(value,
                                 base::UTF8ToUTF16("^[0-9]{4}-[0-9]{1,2}$"))) {
     return;
   }
 
   std::vector<base::string16> year_month;
@@ skipping 280 matching lines @@
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kUnionPay = "unionPayCC";
 const char* const kVisaCard = "visaCC";
 
 }  // namespace autofill