Adding summary string generation for the AutoFill feature.

Includes a small modification to the generated resources, needed additional whitespace
in credit card summary.  Added summary generation to autofill_profile.* and modified
summary generation in credit_card.* to match.  credit_card.* modifications were largely
to use string16 instead of std::wstring.

Factored out common unit testing utilities into autofill_common_unittest.*, and added
unit tests for summary string generation for credit_card.* and autofill_profile.*.

BUG=35551
TEST=unit_tests --gtest_filter=AutoFillProfileTest.*:CreditCardTest.*


Review URL: http://codereview.chromium.org/606031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39002 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 13 deletions

diff --git a/chrome/browser/autofill/credit_card.cc b/chrome/browser/autofill/credit_card.cc
index e32ccf1..1d4ba55 100644
--- a/chrome/browser/autofill/credit_card.cc
+++ b/chrome/browser/autofill/credit_card.cc
@@ -262,27 +262,26 @@ void CreditCard::set_expiration_year(int expiration_year) {
   expiration_year_ = expiration_year;
 }
 
-std::wstring CreditCard::PreviewSummary() const {
-  // TODO(georgey): add unit-test
-  std::wstring preview;
+string16 CreditCard::PreviewSummary() const {
+  string16 preview;
   if (number().empty())
     return preview;  // No CC number, means empty preview.
-  std::wstring obfuscated_cc_number(L"************");
-  obfuscated_cc_number.append(UTF16ToWide(last_four_digits()));
+  string16 obfuscated_cc_number(ASCIIToUTF16("************"));
+  obfuscated_cc_number.append(last_four_digits());
   if (!expiration_month() || !expiration_year())
     return obfuscated_cc_number;  // no expiration date set
   // TODO(georgey): internationalize date
-  std::wstring formatted_date(UTF16ToWide(ExpirationMonthAsString()));
-  formatted_date.append(L"/");
-  formatted_date.append(UTF16ToWide(Expiration4DigitYearAsString()));
-
-  preview = l10n_util::GetStringF(IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT,
-                                  obfuscated_cc_number,
-                                  formatted_date);
+  string16 formatted_date(ExpirationMonthAsString());
+  formatted_date.append(ASCIIToUTF16("/"));
+  formatted_date.append(Expiration4DigitYearAsString());
+
+  preview = l10n_util::GetStringFUTF16(
+      IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT,
+      obfuscated_cc_number,
+      formatted_date);
   return preview;
 }
 
-
 void CreditCard::operator=(const CreditCard& source) {
   number_ = source.number_;
   name_on_card_ = source.name_on_card_;