[Autofill] Add credit card first and last name heuristics predictions.

components/autofill/core/browser/credit_card_field.cc

 // Copyright 2013 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 "components/autofill/core/browser/credit_card_field.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 93 matching lines @@
       // fields. So we search for "name" only when we've already parsed at
       // least one other credit card field and haven't yet parsed the
       // expiration date (which usually appears at the end).
       if (fields > 0 &&
           !credit_card_field->expiration_month_ &&
           ParseField(scanner,
                      base::UTF8ToUTF16(kNameOnCardContextualRe),
                      &credit_card_field->cardholder_)) {
         continue;
       }
+    } else if (!credit_card_field->cardholder_last_) {
+      // Search for a last name. Since this is a dangerously generic search, we
+      // execute it only after we have found a valid credit card (first) name
+      // and haven't yet parsed the expiration date (which usually appears at
+      // the end).
+      if (!credit_card_field->expiration_month_ &&
+          ParseField(scanner, base::UTF8ToUTF16(kLastNameRe),
+                     &credit_card_field->cardholder_last_)) {
+        continue;
+      }
     }
 
     // Check for a credit card type (Visa, MasterCard, etc.) field.
     // All CC type fields encountered so far have been of type select.
     if (!credit_card_field->type_ && LikelyCardTypeSelectField(scanner)) {
       credit_card_field->type_ = scanner->Cursor();
       scanner->Advance();
       continue;
     }
 
@@ skipping 197 matching lines @@
 
   AddClassification(type_, CREDIT_CARD_TYPE, kBaseCreditCardParserScore,
                     field_candidates);
   AddClassification(verification_, CREDIT_CARD_VERIFICATION_CODE,
                     kBaseCreditCardParserScore, field_candidates);
 
   // If the heuristics detected first and last name in separate fields,
   // then ignore both fields. Putting them into separate fields is probably
   // wrong, because the credit card can also contain a middle name or middle
   // initial.
-  if (cardholder_last_ == nullptr)
-    AddClassification(cardholder_, CREDIT_CARD_NAME, kBaseCreditCardParserScore,
-                      field_candidates);
+  if (cardholder_last_ == nullptr) {
+    AddClassification(cardholder_, CREDIT_CARD_NAME_FULL,
+                      kBaseCreditCardParserScore, field_candidates);
+  } else {
+    AddClassification(cardholder_, CREDIT_CARD_NAME_FIRST,
+                      kBaseCreditCardParserScore, field_candidates);
+    AddClassification(cardholder_last_, CREDIT_CARD_NAME_LAST,
+                      kBaseCreditCardParserScore, field_candidates);
+  }
 
   if (expiration_date_) {
     DCHECK(!expiration_month_);
     DCHECK(!expiration_year_);
     AddClassification(expiration_date_, GetExpirationYearType(),
                       kBaseCreditCardParserScore, field_candidates);
   } else {
     AddClassification(expiration_month_, CREDIT_CARD_EXP_MONTH,
                       kBaseCreditCardParserScore, field_candidates);
     AddClassification(expiration_year_, GetExpirationYearType(),
@@ skipping 111 matching lines @@
 
 ServerFieldType CreditCardField::GetExpirationYearType() const {
   return (expiration_date_
               ? exp_year_type_
               : ((expiration_year_ && expiration_year_->max_length == 2)
                      ? CREDIT_CARD_EXP_2_DIGIT_YEAR
                      : CREDIT_CARD_EXP_4_DIGIT_YEAR));
 }
 
 }  // namespace autofill