Validate saved credit card number in interactive autocomplete

chrome/browser/ui/autofill/data_model_wrapper.cc

 // Copyright (c) 2012 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/ui/autofill/data_model_wrapper.h"
 
 #include "base/callback.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
@@ skipping 122 matching lines @@
 
   return AutofillDataModelWrapper::GetInfo(type);
 }
 
 gfx::Image AutofillCreditCardWrapper::GetIcon() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetImageNamed(CreditCard::IconResourceId(card_->type()));
 }
 
 string16 AutofillCreditCardWrapper::GetDisplayText() {
-  if (!autofill::IsValidCreditCardExpirationDate(
-           card_->GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR),
-           card_->GetRawInfo(CREDIT_CARD_EXP_MONTH),
-           base::Time::Now())) {
+  if (!card_->IsValid())
     return string16();
-  }
 
   return card_->TypeAndLastFourDigits();
 }
 
 void AutofillCreditCardWrapper::FillFormField(AutofillField* field) const {
   AutofillFieldType field_type = field->type();
 
   if (field_type == NAME_FULL) {
     // Requests for the user's full name are filled from the credit card data,
     // but the CreditCard class only knows how to fill credit card fields.  So,
@@ skipping 94 matching lines @@
 }
 
 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}
 
 string16 FullWalletShippingWrapper::GetInfo(AutofillFieldType type) const {
   return full_wallet_->shipping_address()->GetInfo(
       type, g_browser_process->GetApplicationLocale());
 }
 
 }  // namespace autofill