[Autofill] Update credit card type detection logic.

components/autofill/core/browser/autofill_manager_unittest.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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1162 matching lines @@
   EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   base::string16 expected_values[] = {
     ASCIIToUTF16("************3456"),
     ASCIIToUTF16("************8765")
   };
   base::string16 expected_labels[] = { ASCIIToUTF16("*3456"),
                                        ASCIIToUTF16("*8765")};
   base::string16 expected_icons[] = {
-    ASCIIToUTF16("visaCC"),
-    ASCIIToUTF16("genericCC")
+    ASCIIToUTF16(kVisaCard),
+    ASCIIToUTF16(kMasterCard)
   };
   int expected_unique_ids[] = {
     autofill_manager_->GetPackedCreditCardID(4),
     autofill_manager_->GetPackedCreditCardID(5)
   };
   ExpectSuggestions(page_id, values, labels, icons, unique_ids,
                     kDefaultPageID, arraysize(expected_values), expected_values,
                     expected_labels, expected_icons, expected_unique_ids);
 }
 
@@ skipping 18 matching lines @@
   int page_id = 0;
   std::vector<base::string16> values;
   std::vector<base::string16> labels;
   std::vector<base::string16> icons;
   std::vector<int> unique_ids;
   EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   base::string16 expected_values[] = {ASCIIToUTF16("************3456")};
   base::string16 expected_labels[] = {ASCIIToUTF16("*3456")};
-  base::string16 expected_icons[] = {ASCIIToUTF16("visaCC")};
+  base::string16 expected_icons[] = {ASCIIToUTF16(kVisaCard)};
   int expected_unique_ids[] = {autofill_manager_->GetPackedCreditCardID(4)};
   ExpectSuggestions(page_id, values, labels, icons, unique_ids,
                     kDefaultPageID, arraysize(expected_values), expected_values,
                     expected_labels, expected_icons, expected_unique_ids);
 }
 
 // Test that we return credit card profile suggestions when the selected form
 // field is not the credit card number field.
 TEST_F(AutofillManagerTest, GetCreditCardSuggestionsNonCCNumber) {
   // Set up our form data.
@@ skipping 18 matching lines @@
   EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   base::string16 expected_values[] = {
     ASCIIToUTF16("Elvis Presley"),
     ASCIIToUTF16("Buddy Holly")
   };
   base::string16 expected_labels[] = { ASCIIToUTF16("*3456"),
                                        ASCIIToUTF16("*8765") };
   base::string16 expected_icons[] = {
-    ASCIIToUTF16("visaCC"),
-    ASCIIToUTF16("genericCC")
+    ASCIIToUTF16(kVisaCard),
+    ASCIIToUTF16(kMasterCard)
   };
   int expected_unique_ids[] = {
     autofill_manager_->GetPackedCreditCardID(4),
     autofill_manager_->GetPackedCreditCardID(5)
   };
   ExpectSuggestions(page_id, values, labels, icons, unique_ids,
                     kDefaultPageID, arraysize(expected_values), expected_values,
                     expected_labels, expected_icons, expected_unique_ids);
 }
 
@@ skipping 102 matching lines @@
     ASCIIToUTF16("************3456"),
     ASCIIToUTF16("************8765"),
     ASCIIToUTF16("************3456")
   };
   base::string16 expected_labels[] = {
     ASCIIToUTF16("*3456"),
     ASCIIToUTF16("*8765"),
     ASCIIToUTF16("*3456"),
   };
   base::string16 expected_icons[] = {
-    ASCIIToUTF16("visaCC"),
-    ASCIIToUTF16("genericCC"),
-    ASCIIToUTF16("masterCardCC")
+    ASCIIToUTF16(kVisaCard),
+    ASCIIToUTF16(kMasterCard),
+    ASCIIToUTF16(kMasterCard)
   };
   int expected_unique_ids[] = {
     autofill_manager_->GetPackedCreditCardID(4),
     autofill_manager_->GetPackedCreditCardID(5),
     autofill_manager_->GetPackedCreditCardID(7)
   };
   ExpectSuggestions(page_id, values, labels, icons, unique_ids,
                     kDefaultPageID, arraysize(expected_values), expected_values,
                     expected_labels, expected_icons, expected_unique_ids);
 }
@@ skipping 50 matching lines @@
   EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   base::string16 expected_values2[] = {
     ASCIIToUTF16("************3456"),
     ASCIIToUTF16("************8765")
   };
   base::string16 expected_labels2[] = { ASCIIToUTF16("*3456"),
                                         ASCIIToUTF16("*8765")};
   base::string16 expected_icons2[] = {
-    ASCIIToUTF16("visaCC"),
-    ASCIIToUTF16("genericCC")
+    ASCIIToUTF16(kVisaCard),
+    ASCIIToUTF16(kMasterCard)
   };
   int expected_unique_ids2[] = {
     autofill_manager_->GetPackedCreditCardID(4),
     autofill_manager_->GetPackedCreditCardID(5)
   };
   ExpectSuggestions(page_id, values, labels, icons, unique_ids,
                     kPageID2, arraysize(expected_values2), expected_values2,
                     expected_labels2, expected_icons2, expected_unique_ids2);
 }
 
@@ skipping 1813 matching lines @@
   CreateTestAddressFormData(&form);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
   const FormFieldData& field = form.fields[0];
   GetAutofillSuggestions(form, field);  // should call the delegate's OnQuery()
 
   autofill_manager_->SetExternalDelegate(NULL);
 }
 
 }  // namespace autofill