Autofill: Allow forms to have multiple distinct CC number inputs.

components/autofill/core/browser/credit_card_field_unittest.cc

Index: components/autofill/core/browser/credit_card_field_unittest.cc
diff --git a/components/autofill/core/browser/credit_card_field_unittest.cc b/components/autofill/core/browser/credit_card_field_unittest.cc
index fbf2f97a5073d5afe1352189eff40124d7b32bea..d143bad5e2d3e7d3bb261a770aa20f643b2a0691 100644
--- a/components/autofill/core/browser/credit_card_field_unittest.cc
+++ b/components/autofill/core/browser/credit_card_field_unittest.cc
@@ -448,7 +448,7 @@ TEST_F(CreditCardFieldTest, ParseCreditCardNumberWithSplit) {
             field_type_map_[ASCIIToUTF16("year6")]);
 }
 
-TEST_F(CreditCardFieldTest, ParseCreditCardNumberWithInvalidSplit) {
+TEST_F(CreditCardFieldTest, ParseMultipleCreditCardNumbers) {
   FormFieldData field;
   field.form_control_type = "text";
 
@@ -460,8 +460,8 @@ TEST_F(CreditCardFieldTest, ParseCreditCardNumberWithInvalidSplit) {
   field.name = ASCIIToUTF16("card_number");
   list_.push_back(new AutofillField(field, ASCIIToUTF16("number2")));
 
-  field.label = ASCIIToUTF16("Not Card Number");
-  field.name = ASCIIToUTF16("not_card_number");
+  field.label = ASCIIToUTF16("Confirm Card Number");
+  field.name = ASCIIToUTF16("confirm_card_number");
   list_.push_back(new AutofillField(field, ASCIIToUTF16("number3")));
 
   field.label = ASCIIToUTF16("Exp Month");
@@ -479,10 +479,10 @@ TEST_F(CreditCardFieldTest, ParseCreditCardNumberWithInvalidSplit) {
   ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("name1")) !=
               field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name1")]);
-  ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("number2")) ==
-              field_type_map_.end());
-  ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("number3")) ==
-              field_type_map_.end());
+  EXPECT_FALSE(field_type_map_.find(ASCIIToUTF16("number2")) ==
+               field_type_map_.end());
+  EXPECT_FALSE(field_type_map_.find(ASCIIToUTF16("number3")) ==
+               field_type_map_.end());

[Ilya Sherman, 2014/10/21 01:28:01]

nit: Please use ASSERT_TRUE + EXPECT_EQ stmts like the other conditions.

[Evan Stade, 2014/10/21 18:38:15]

Done.

   ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("month4")) !=
               field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month4")]);