AutoFill displayed CC# should include an asterisk e.g. Profile;*1234

Changes separator used in AutoFill label containing credit card info to prefix the card number with an asterisk.

BUG=50075
TEST=AutoFillManagerTest.GetCreditCardSuggestions*

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

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

2 files changed, 29 insertions, 32 deletions

diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc
index b5b28fe..d58a10d 100644
--- a/chrome/browser/autofill/autofill_manager.cc
+++ b/chrome/browser/autofill/autofill_manager.cc
@@ -38,7 +38,7 @@ const int kAutoFillPhoneNumberPrefixCount = 3;
 const int kAutoFillPhoneNumberSuffixOffset = 3;
 const int kAutoFillPhoneNumberSuffixCount = 4;
 
-const string16::value_type kLabelSeparator[] = {';',' ',0};
+const string16::value_type kLabelSeparator[] = {';',' ', '*', 0};
 
 // Removes duplicate elements whilst preserving original order of |elements| and
 // |unique_ids|.
@@ -504,8 +504,7 @@ void AutoFillManager::GetProfileSuggestions(FormStructure* form,
          personal_data_->credit_cards().begin();
          cc != personal_data_->credit_cards().end(); ++cc) {
       expanded_values.push_back((*values)[i]);
-      string16 label = (*labels)[i] + kLabelSeparator +
-          (*cc)->LastFourDigits();
+      string16 label = (*labels)[i] + kLabelSeparator + (*cc)->LastFourDigits();
       expanded_labels.push_back(label);
       unique_ids->push_back(profile->unique_id());
     }
@@ -565,8 +564,7 @@ void AutoFillManager::GetBillingProfileSuggestions(
          iter != personal_data_->profiles().end(); ++iter) {
       values->push_back(billing_profile->GetFieldText(type));
 
-      string16 label = (*iter)->Label() +
-                       ASCIIToUTF16("; ") +
+      string16 label = (*iter)->Label() + kLabelSeparator +
                        (*cc)->LastFourDigits();
       labels->push_back(label);
       unique_ids->push_back((*iter)->unique_id());
@@ -607,8 +605,7 @@ void AutoFillManager::GetCreditCardSuggestions(FormStructure* form,
              iter != personal_data_->profiles().end(); ++iter) {
           values->push_back(creditcard_field_value);
 
-          string16 label = (*iter)->Label() +
-                           ASCIIToUTF16("; ") +
+          string16 label = (*iter)->Label() + kLabelSeparator +
                            credit_card->LastFourDigits();
           labels->push_back(label);
           unique_ids->push_back((*iter)->unique_id());
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index bcc9e4c..6cceed9 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -389,12 +389,12 @@ TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsEmptyValue) {
   EXPECT_EQ(ASCIIToUTF16("************8765"), values[4]);
   EXPECT_EQ(ASCIIToUTF16("************8765"), values[5]);
   ASSERT_EQ(6U, labels.size());
-  EXPECT_EQ(ASCIIToUTF16("Home; 3456"), labels[0]);
-  EXPECT_EQ(ASCIIToUTF16("Work; 3456"), labels[1]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; 3456"), labels[2]);
-  EXPECT_EQ(ASCIIToUTF16("Home; 8765"), labels[3]);
-  EXPECT_EQ(ASCIIToUTF16("Work; 8765"), labels[4]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; 8765"), labels[5]);
+  EXPECT_EQ(ASCIIToUTF16("Home; *3456"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Work; *3456"), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("Empty; *3456"), labels[2]);
+  EXPECT_EQ(ASCIIToUTF16("Home; *8765"), labels[3]);
+  EXPECT_EQ(ASCIIToUTF16("Work; *8765"), labels[4]);
+  EXPECT_EQ(ASCIIToUTF16("Empty; *8765"), labels[5]);
 }
 
 TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsMatchCharacter) {
@@ -430,9 +430,9 @@ TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsMatchCharacter) {
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[1]);
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[2]);
   ASSERT_EQ(3U, labels.size());
-  EXPECT_EQ(ASCIIToUTF16("Home; 3456"), labels[0]);
-  EXPECT_EQ(ASCIIToUTF16("Work; 3456"), labels[1]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; 3456"), labels[2]);
+  EXPECT_EQ(ASCIIToUTF16("Home; *3456"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Work; *3456"), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("Empty; *3456"), labels[2]);
 }
 
 TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsNonCCNumber) {
@@ -471,12 +471,12 @@ TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsNonCCNumber) {
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[4]);
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[5]);
   ASSERT_EQ(6U, labels.size());
-  EXPECT_EQ(ASCIIToUTF16("Home; 3456"), labels[0]);
-  EXPECT_EQ(ASCIIToUTF16("Work; 3456"), labels[1]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; 3456"), labels[2]);
-  EXPECT_EQ(ASCIIToUTF16("Home; 8765"), labels[3]);
-  EXPECT_EQ(ASCIIToUTF16("Work; 8765"), labels[4]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; 8765"), labels[5]);
+  EXPECT_EQ(ASCIIToUTF16("Home; *3456"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Work; *3456"), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("Empty; *3456"), labels[2]);
+  EXPECT_EQ(ASCIIToUTF16("Home; *8765"), labels[3]);
+  EXPECT_EQ(ASCIIToUTF16("Work; *8765"), labels[4]);
+  EXPECT_EQ(ASCIIToUTF16("Empty; *8765"), labels[5]);
 }
 
 TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsSemicolon) {
@@ -526,14 +526,14 @@ TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsSemicolon) {
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[6]);
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[7]);
   ASSERT_EQ(8U, labels.size());
-  EXPECT_EQ(ASCIIToUTF16("Home; 3456"), labels[0]);
-  EXPECT_EQ(ASCIIToUTF16("Work; 3456"), labels[1]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; 3456"), labels[2]);
-  EXPECT_EQ(ASCIIToUTF16("Home; 8765; 3456"), labels[3]);
-  EXPECT_EQ(ASCIIToUTF16("Home; 8765"), labels[4]);
-  EXPECT_EQ(ASCIIToUTF16("Work; 8765"), labels[5]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; 8765"), labels[6]);
-  EXPECT_EQ(ASCIIToUTF16("Home; 8765; 8765"), labels[7]);
+  EXPECT_EQ(ASCIIToUTF16("Home; *3456"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Work; *3456"), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("Empty; *3456"), labels[2]);
+  EXPECT_EQ(ASCIIToUTF16("Home; 8765; *3456"), labels[3]);
+  EXPECT_EQ(ASCIIToUTF16("Home; *8765"), labels[4]);
+  EXPECT_EQ(ASCIIToUTF16("Work; *8765"), labels[5]);
+  EXPECT_EQ(ASCIIToUTF16("Empty; *8765"), labels[6]);
+  EXPECT_EQ(ASCIIToUTF16("Home; 8765; *8765"), labels[7]);
 }
 
 TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsNonHTTPS) {
@@ -730,7 +730,7 @@ TEST_F(AutoFillManagerTest, FillCreditCardForm) {
       autofill_manager_->FillAutoFillFormData(kPageID,
                                               form,
                                               string16(),
-                                              ASCIIToUTF16("Home; 3456"),
+                                              ASCIIToUTF16("Home; *3456"),
                                               1));
 
   int page_id = 0;
@@ -888,7 +888,7 @@ TEST_F(AutoFillManagerTest, FillBillFormSemicolon) {
   // an IPC message back to the renderer.
   const int kPageID = 1;
   EXPECT_TRUE(autofill_manager_->FillAutoFillFormData(
-      kPageID, form, string16(), ASCIIToUTF16("Home; 8765; 3456"), 6));
+      kPageID, form, string16(), ASCIIToUTF16("Home; 8765; *3456"), 6));
 
   int page_id = 0;
   FormData results;