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

components/autofill/core/browser/name_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/name_field.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 10 matching lines @@
 // A form field that can parse a full name field.
 class FullNameField : public NameField {
  public:
   static FullNameField* Parse(AutofillScanner* scanner);
 
  protected:
   // FormField:
   virtual bool ClassifyField(ServerFieldTypeMap* map) const OVERRIDE;
 
  private:
-  explicit FullNameField(const AutofillField* field);
+  explicit FullNameField(AutofillField* field);
 
-  const AutofillField* field_;
+  AutofillField* field_;
 
   DISALLOW_COPY_AND_ASSIGN(FullNameField);
 };
 
 // A form field that can parse a first and last name field.
 class FirstLastNameField : public NameField {
  public:
   static FirstLastNameField* ParseSpecificName(AutofillScanner* scanner);
   static FirstLastNameField* ParseComponentNames(AutofillScanner* scanner);
   static FirstLastNameField* Parse(AutofillScanner* scanner);
 
  protected:
   // FormField:
   virtual bool ClassifyField(ServerFieldTypeMap* map) const OVERRIDE;
 
  private:
   FirstLastNameField();
 
-  const AutofillField* first_name_;
-  const AutofillField* middle_name_;  // Optional.
-  const AutofillField* last_name_;
+  AutofillField* first_name_;
+  AutofillField* middle_name_;  // Optional.
+  AutofillField* last_name_;
   bool middle_initial_;  // True if middle_name_ is a middle initial.
 
   DISALLOW_COPY_AND_ASSIGN(FirstLastNameField);
 };
 
 }  // namespace
 
 FormField* NameField::Parse(AutofillScanner* scanner) {
   if (scanner->IsEnd())
     return NULL;
@@ skipping 15 matching lines @@
   scanner->SaveCursor();
   bool should_ignore = ParseField(scanner,
                                   UTF8ToUTF16(autofill::kNameIgnoredRe), NULL);
   scanner->Rewind();
   if (should_ignore)
     return NULL;
 
   // Searching for any label containing the word "name" is too general;
   // for example, Travelocity_Edit travel profile.html contains a field
   // "Travel Profile Name".
-  const AutofillField* field = NULL;
+  AutofillField* field = NULL;
   if (ParseField(scanner, UTF8ToUTF16(autofill::kNameRe), &field))
     return new FullNameField(field);
 
   return NULL;
 }
 
 bool FullNameField::ClassifyField(ServerFieldTypeMap* map) const {
   return AddClassification(field_, NAME_FULL, map);
 }
 
-FullNameField::FullNameField(const AutofillField* field)
-    : field_(field) {
+FullNameField::FullNameField(AutofillField* field) : field_(field) {
 }
 
 FirstLastNameField* FirstLastNameField::ParseSpecificName(
     AutofillScanner* scanner) {
   // Some pages (e.g. Overstock_comBilling.html, SmithsonianCheckout.html)
   // have the label "Name" followed by two or three text fields.
   scoped_ptr<FirstLastNameField> v(new FirstLastNameField);
   scanner->SaveCursor();
 
-  const AutofillField* next = NULL;
+  AutofillField* next = NULL;
   if (ParseField(scanner,
                  UTF8ToUTF16(autofill::kNameSpecificRe), &v->first_name_) &&
       ParseEmptyLabel(scanner, &next)) {
     if (ParseEmptyLabel(scanner, &v->last_name_)) {
       // There are three name fields; assume that the middle one is a
       // middle initial (it is, at least, on SmithsonianCheckout.html).
       v->middle_name_ = next;
       v->middle_initial_ = true;
     } else {  // only two name fields
       v->last_name_ = next;
@@ skipping 87 matching lines @@
 
 bool FirstLastNameField::ClassifyField(ServerFieldTypeMap* map) const {
   bool ok = AddClassification(first_name_, NAME_FIRST, map);
   ok = ok && AddClassification(last_name_, NAME_LAST, map);
   ServerFieldType type = middle_initial_ ? NAME_MIDDLE_INITIAL : NAME_MIDDLE;
   ok = ok && AddClassification(middle_name_, type, map);
   return ok;
 }
 
 }  // namespace autofill