Add ignore matching text for name field.

chrome/browser/autofill/credit_card_field.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_field.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 32 matching lines @@
       string16 name_pattern;
       if (is_ecml) {
         name_pattern = GetEcmlPattern(kEcmlCardHolder);
       } else {
         if (fields == 0 || credit_card_field->expiration_month_) {
           // at beginning or end
           name_pattern = l10n_util::GetStringUTF16(
               IDS_AUTOFILL_NAME_ON_CARD_RE);
         } else {
           name_pattern = l10n_util::GetStringUTF16(
               IDS_AUTOFILL_NAME_ON_CARD_CONTEXTUAL_RE);

[dhollowa, 2011/08/01 17:02:27]

This is the source of the problem.  This essentially says that any ".*name.*"
following any ".*number.*" should be considered to be a credit card.

This is overly agressive.  We should just get rid of this contextual name
matching entirely.  That should do it.

         }
       }
 
       if (ParseField(scanner, name_pattern, &credit_card_field->cardholder_))
         continue;
 
       // As a hard-coded hack for Expedia's billing pages (expedia_checkout.html
       // and ExpediaBilling.html in our test suite), recognize separate fields
       // for the cardholder's first and last name if they have the labels "cfnm"
       // and "clnm".
@@ skipping 86 matching lines @@
     // the credit card section being processed but are uninteresting to us.
     if (ParseField(scanner,
                    l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_IGNORED_RE),
                    NULL)) {
       continue;
     }
 
     break;
   }
 
+  bool has_expiration_year_month = credit_card_field->expiration_month_ &&
+      (credit_card_field->expiration_year_ ||
+       LowerCaseEqualsASCII(
+           credit_card_field->expiration_month_->form_control_type, "month"));
+
   // Some pages have a billing address field after the cardholder name field.
   // For that case, allow only just the cardholder name field.  The remaining
   // CC fields will be picked up in a following CreditCardField.
-  if (credit_card_field->cardholder_)
+  // But credit card number is strongly tied with expiration year/month, so
+  // we should eliminate the case when we found only card number without
+  // expiration year/month.
+  if (credit_card_field->cardholder_ &&
+      !(credit_card_field->number_ && !has_expiration_year_month)) {
     return credit_card_field.release();
+  }
 
   // On some pages, the user selects a card type using radio buttons
   // (e.g. test page Apple Store Billing.html).  We can't handle that yet,
   // so we treat the card type as optional for now.
   // The existence of a number or cvc in combination with expiration date is
   // a strong enough signal that this is a credit card.  It is possible that
   // the number and name were parsed in a separate part of the form.  So if
   // the cvc and date were found independently they are returned.
   if ((credit_card_field->number_ || credit_card_field->verification_) &&
-      credit_card_field->expiration_month_ &&
-      (credit_card_field->expiration_year_ ||
-      (LowerCaseEqualsASCII(
-           credit_card_field->expiration_month_->form_control_type,
-           "month")))) {
+      has_expiration_year_month) {
     return credit_card_field.release();
   }
 
   scanner->RewindTo(saved_cursor);
   return NULL;
 }
 
 CreditCardField::CreditCardField()
     : cardholder_(NULL),
       cardholder_last_(NULL),
@@ skipping 14 matching lines @@
   if (cardholder_last_ == NULL)
     ok = ok && AddClassification(cardholder_, CREDIT_CARD_NAME, map);
 
   ok = ok && AddClassification(type_, CREDIT_CARD_TYPE, map);
   ok = ok && AddClassification(expiration_month_, CREDIT_CARD_EXP_MONTH, map);
   ok = ok && AddClassification(expiration_year_,
                                CREDIT_CARD_EXP_4_DIGIT_YEAR,
                                map);
   return ok;
 }