[Autofill] Autofill fails to fill credit card number when split across fields.

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 "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 70 matching lines @@
     // card number and match the general term "number".  The security code
     // has a plethora of names; we've seen "verification #",
     // "verification number", "card identification number" and others listed
     // in the |pattern| below.
     base::string16 pattern = base::UTF8ToUTF16(autofill::kCardCvcRe);
     if (!credit_card_field->verification_ &&
         ParseField(scanner, pattern, &credit_card_field->verification_)) {
       continue;
     }
 
+    pattern = base::UTF8ToUTF16(autofill::kCardNumberPart1Re);
+    if (!credit_card_field->number_part1_ &&
+        ParseField(scanner, pattern, &credit_card_field->number_part1_)) {
+      continue;
+    }
+
+    pattern = base::UTF8ToUTF16(autofill::kCardNumberPart2Re);
+    if (!credit_card_field->number_part2_ &&
+        ParseField(scanner, pattern, &credit_card_field->number_part2_)) {
+      continue;
+    }
+
+    pattern = base::UTF8ToUTF16(autofill::kCardNumberPart3Re);
+    if (!credit_card_field->number_part3_ &&
+        ParseField(scanner, pattern, &credit_card_field->number_part3_)) {
+      continue;
+    }
+
+    pattern = base::UTF8ToUTF16(autofill::kCardNumberPart4Re);
+    if (!credit_card_field->number_part4_ &&
+        ParseField(scanner, pattern, &credit_card_field->number_part4_)) {
+      continue;
+    }
+
     pattern = base::UTF8ToUTF16(autofill::kCardNumberRe);
-    if (!credit_card_field->number_ &&
-        ParseField(scanner, pattern, &credit_card_field->number_)) {
+    if (!credit_card_field->number_full_ &&
+        ParseField(scanner, pattern, &credit_card_field->number_full_)) {
       continue;
     }
 
     if (LowerCaseEqualsASCII(scanner->Cursor()->form_control_type, "month")) {
       credit_card_field->expiration_date_ = scanner->Cursor();
       scanner->Advance();
     } else {
       // First try to parse split month/year expiration fields.
       scanner->SaveCursor();
       pattern = base::UTF8ToUTF16(autofill::kExpirationMonthRe);
@@ skipping 56 matching lines @@
   if (credit_card_field->cardholder_)
     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_) &&
+  if ((credit_card_field->number_full_ || credit_card_field->verification_) &&
       (credit_card_field->expiration_date_ ||
        (credit_card_field->expiration_month_ &&
         credit_card_field->expiration_year_))) {
     return credit_card_field.release();
   }
 
   scanner->RewindTo(saved_cursor);
   return NULL;
 }
 
 CreditCardField::CreditCardField()
     : cardholder_(NULL),
       cardholder_last_(NULL),
       type_(NULL),
-      number_(NULL),
+      number_full_(NULL),
+      number_part1_(NULL),
+      number_part2_(NULL),
+      number_part3_(NULL),
+      number_part4_(NULL),
       verification_(NULL),
       expiration_month_(NULL),
       expiration_year_(NULL),
       expiration_date_(NULL),
       is_two_digit_year_(false) {
 }
 
 bool CreditCardField::ClassifyField(ServerFieldTypeMap* map) const {
-  bool ok = AddClassification(number_, CREDIT_CARD_NUMBER, map);
+  bool ok = AddClassification(number_full_, CREDIT_CARD_NUMBER, map);
   ok = ok && AddClassification(type_, CREDIT_CARD_TYPE, map);
   ok = ok && AddClassification(verification_, CREDIT_CARD_VERIFICATION_CODE,
                                map);
 
   // 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_ == NULL)
     ok = ok && AddClassification(cardholder_, CREDIT_CARD_NAME, map);
@@ skipping 11 matching lines @@
     if (is_two_digit_year_) {
       ok = ok && AddClassification(expiration_year_,
                                    CREDIT_CARD_EXP_2_DIGIT_YEAR,
                                    map);
     } else {
       ok = ok && AddClassification(expiration_year_,
                                    CREDIT_CARD_EXP_4_DIGIT_YEAR,
                                    map);
     }
   }
+  if (number_full_ == NULL) {
+    ok = ok && AddClassification(number_part1_, CREDIT_CARD_NUMBER_PART1, map);
+    ok = ok && AddClassification(number_part2_, CREDIT_CARD_NUMBER_PART2, map);
+    ok = ok && AddClassification(number_part3_, CREDIT_CARD_NUMBER_PART3, map);
+    ok = ok && AddClassification(number_part4_, CREDIT_CARD_NUMBER_PART4, map);
+  }
 
   return ok;
 }
 
 }  // namespace autofill