Set datapresent string to contain precisely those field types available in stored Autofill data.

chrome/browser/autofill/credit_card.cc

Index: chrome/browser/autofill/credit_card.cc
diff --git a/chrome/browser/autofill/credit_card.cc b/chrome/browser/autofill/credit_card.cc
index 4018fe424b7db03e43e20687dde58f19f15b2aa4..224719dcdf587a6c50bcf36c655fd80ed45f4293 100644
--- a/chrome/browser/autofill/credit_card.cc
+++ b/chrome/browser/autofill/credit_card.cc
@@ -173,6 +173,12 @@ void CreditCard::GetPossibleFieldTypes(const string16& text,
 
   if (Is4DigitExpirationYear(text))
     possible_types->insert(CREDIT_CARD_EXP_4_DIGIT_YEAR);
+
+  if (text == GetInfo(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR))
+    possible_types->insert(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR);
+
+  if (text == GetInfo(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR))
+    possible_types->insert(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR);
 }
 
 void CreditCard::GetAvailableFieldTypes(FieldTypeSet* available_types) const {
@@ -192,6 +198,12 @@ void CreditCard::GetAvailableFieldTypes(FieldTypeSet* available_types) const {
 
   if (!Expiration4DigitYearAsString().empty())
     available_types->insert(CREDIT_CARD_EXP_4_DIGIT_YEAR);
+
+  if (!GetInfo(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR).empty())
+    available_types->insert(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR);
+
+  if (!GetInfo(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR).empty())
+    available_types->insert(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR);
 }
 
 string16 CreditCard::GetInfo(AutofillFieldType type) const {
@@ -259,6 +271,14 @@ void CreditCard::SetInfo(AutofillFieldType type, const string16& value) {
       SetExpirationYearFromString(value);
       break;
 
+    case CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR:
+      // This is a read-only attribute.
+      break;
+
+    case CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR:
+      // This is a read-only attribute.
+      break;
+
     case CREDIT_CARD_TYPE:
       // We determine the type based on the number.
       break;