[Autofill] Autofill incorrectly fills credit card expiration year in 2-digit fields.

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 037a302c340359eaef21595384e09f04342dddfc..3a7438667c915eff8de6b009bf3d1416ac0d9d70 100644
--- a/components/autofill/core/browser/credit_card_field_unittest.cc
+++ b/components/autofill/core/browser/credit_card_field_unittest.cc
@@ -347,4 +347,69 @@ TEST_F(CreditCardFieldTest, ParseMonthControl) {
             field_type_map_[ASCIIToUTF16("date2")]);
 }
 
+// Verify that heuristics <input name="ccyear" maxlength="2"/> considers
+// *maxlength* attribute while parsing 2 Digit expiration year.
+TEST_F(CreditCardFieldTest, ParseCreditCardExpYear_2DigitMaxLength) {
+  FormFieldData field;
+  field.form_control_type = "text";
+
+  field.label = ASCIIToUTF16("Card Number");
+  field.name = ASCIIToUTF16("card_number");
+  list_.push_back(new AutofillField(field, ASCIIToUTF16("number")));
+
+  field.label = ASCIIToUTF16("Expiration Date");
+  field.name = ASCIIToUTF16("ccmonth");
+  list_.push_back(new AutofillField(field, ASCIIToUTF16("month")));
+
+  field.name = ASCIIToUTF16("ccyear");
+  field.max_length = 2;
+  list_.push_back(new AutofillField(field, ASCIIToUTF16("year")));
+
+  Parse();
+  ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
+  EXPECT_TRUE(ClassifyField());
+  ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("number")) !=
+              field_type_map_.end());
+  EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number")]);
+  ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("month")) !=
+              field_type_map_.end());
+  EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month")]);
+  ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("year")) !=
+              field_type_map_.end());
+  EXPECT_EQ(CREDIT_CARD_EXP_2_DIGIT_YEAR,
+            field_type_map_[ASCIIToUTF16("year")]);
+}
+
+TEST_F(CreditCardFieldTest, ParseExpMonthAndYear_2DigitMaxLength) {
+  FormFieldData field;
+  field.form_control_type = "text";
+
+  field.label = ASCIIToUTF16("Card Number");
+  field.name = ASCIIToUTF16("card_number");
+  list_.push_back(new AutofillField(field, ASCIIToUTF16("number")));
+
+  field.label = ASCIIToUTF16("ExpDate Month / Year");
+  field.name = ASCIIToUTF16("ExpDate");
+  list_.push_back(new AutofillField(field, ASCIIToUTF16("month")));
+
+  field.label = ASCIIToUTF16("ExpDate Month / Year");
+  field.name = ASCIIToUTF16("ExpDate");
+  field.max_length = 2;
+  list_.push_back(new AutofillField(field, ASCIIToUTF16("year")));
+
+  Parse();
+  ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
+  EXPECT_TRUE(ClassifyField());
+  ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("number")) !=
+              field_type_map_.end());
+  EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number")]);
+  ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("month")) !=
+              field_type_map_.end());
+  EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month")]);
+  ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("year")) !=
+              field_type_map_.end());
+  EXPECT_EQ(CREDIT_CARD_EXP_2_DIGIT_YEAR,
+            field_type_map_[ASCIIToUTF16("year")]);
+}
+
 }  // namespace autofill