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

chrome/browser/autofill/credit_card.cc

 // Copyright (c) 2011 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 "chrome/browser/autofill/credit_card.h"
 
 #include <stddef.h>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 155 matching lines @@
     possible_types->insert(CREDIT_CARD_NUMBER);
 
   if (IsExpirationMonth(text))
     possible_types->insert(CREDIT_CARD_EXP_MONTH);
 
   if (Is2DigitExpirationYear(text))
     possible_types->insert(CREDIT_CARD_EXP_2_DIGIT_YEAR);
 
   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 {
   DCHECK(available_types);
 
   if (!name_on_card_.empty())
     available_types->insert(CREDIT_CARD_NAME);
 
   if (!number_.empty())
     available_types->insert(CREDIT_CARD_NUMBER);
 
   if (!ExpirationMonthAsString().empty())
     available_types->insert(CREDIT_CARD_EXP_MONTH);
 
   if (!Expiration2DigitYearAsString().empty())
     available_types->insert(CREDIT_CARD_EXP_2_DIGIT_YEAR);
 
   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 {
   switch (type) {
     case CREDIT_CARD_NAME:
       return name_on_card_;
 
     case CREDIT_CARD_EXP_MONTH:
       return ExpirationMonthAsString();
 
@@ skipping 47 matching lines @@
       break;
 
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
       // This is a read-only attribute.
       break;
 
     case CREDIT_CARD_EXP_4_DIGIT_YEAR:
       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;
 
     case CREDIT_CARD_NUMBER: {
       // Don't change the real value if the input is an obfuscated string.
       if (value.size() > 0 && value[0] != kCreditCardObfuscationSymbol)
         SetNumber(value);
       break;
     }
@@ skipping 283 matching lines @@
 // send these strings to WK, which then asks WebKitClientImpl to load the image
 // data.
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kSoloCard = "soloCC";
 const char* const kVisaCard = "visaCC";