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(card_->IconResourceId());
 }
 
 string16 AutofillCreditCardWrapper::GetDisplayText() {
   if (!autofill::IsValidCreditCardExpirationDate(

[Evan Stade, 2013/06/14 22:29:49]

I feel like this should be a function on card_

[please use gerrit instead, 2013/06/17 18:35:42]

Done.

-           card_->GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR),
-           card_->GetRawInfo(CREDIT_CARD_EXP_MONTH),
-           base::Time::Now())) {
+          card_->GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR),
+          card_->GetRawInfo(CREDIT_CARD_EXP_MONTH),
+          base::Time::Now()) ||
+      !autofill::IsValidCreditCardNumber(
+          card_->GetRawInfo(CREDIT_CARD_NUMBER))) {
     return string16();
   }
 
   return card_->TypeAndLastFourDigits();
 }
 
 void AutofillCreditCardWrapper::FillFormField(AutofillField* field) const {
   AutofillFieldType field_type = field->type();
 
   if (field_type == NAME_FULL) {
@@ skipping 13 matching lines @@
 WalletAddressWrapper::WalletAddressWrapper(
     const wallet::Address* address) : address_(address) {}
 
 WalletAddressWrapper::~WalletAddressWrapper() {}
 
 string16 WalletAddressWrapper::GetInfo(AutofillFieldType type) const {
   return address_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
 string16 WalletAddressWrapper::GetDisplayText() {
   if (!address_->is_complete_address() ||

[Evan Stade, 2013/06/14 22:29:49]

like this, sort of. (you also need to do validation checks here it would seem)

[please use gerrit instead, 2013/06/17 18:35:42]

I'm working on that in a separate CL. (Small CLs are best CLs!)

       GetInfo(PHONE_HOME_WHOLE_NUMBER).empty()) {
     return string16();
   }
 
   return DataModelWrapper::GetDisplayText();
 }
 
 // WalletInstrumentWrapper
 
 WalletInstrumentWrapper::WalletInstrumentWrapper(
@@ skipping 62 matching lines @@
 }
 
 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}
 
 string16 FullWalletShippingWrapper::GetInfo(AutofillFieldType type) const {
   return full_wallet_->shipping_address()->GetInfo(
       type, g_browser_process->GetApplicationLocale());
 }
 
 }  // namespace autofill