Autofill: Set requirements for number of recognized fields in an autofillable form

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/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_regex_constants.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/browser/autofill_type.h"
 
 using base::UTF8ToUTF16;
 
 namespace autofill {
 namespace {
 
 // A form field that can parse a full name field.
 class FullNameField : public NameField {
  public:
   static scoped_ptr<FullNameField> Parse(AutofillScanner* scanner);
 
  protected:
   // FormField:
   bool ClassifyField(ServerFieldTypeMap* map) const override;
+  size_t FieldCount() const override;
 
  private:
   explicit FullNameField(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 scoped_ptr<FirstLastNameField> ParseSpecificName(
       AutofillScanner* scanner);
   static scoped_ptr<FirstLastNameField> ParseComponentNames(
       AutofillScanner* scanner);
   static scoped_ptr<FirstLastNameField> Parse(AutofillScanner* scanner);
 
  protected:
   // FormField:
   bool ClassifyField(ServerFieldTypeMap* map) const override;
+  size_t FieldCount() const override;
 
  private:
   FirstLastNameField();
 
   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
 
 // static
 scoped_ptr<FormField> NameField::Parse(AutofillScanner* scanner) {
   if (scanner->IsEnd())
     return NULL;
 
   // Try FirstLastNameField first since it's more specific.
   scoped_ptr<FormField> field = FirstLastNameField::Parse(scanner);
   if (!field)
     field = FullNameField::Parse(scanner);
   return field;
 }
 
 // This is overriden in concrete subclasses.
 bool NameField::ClassifyField(ServerFieldTypeMap* map) const {
+  NOTREACHED();
   return false;
 }
 
+// This is overriden in concrete subclasses.

[Evan Stade, 2015/01/21 22:52:50]

nit: spelling

[Lei Zhang, 2015/01/22 08:07:37]

Done.

+size_t NameField::FieldCount() const {
+  NOTREACHED();
+  return 0;
+}
+
 // static
 scoped_ptr<FullNameField> FullNameField::Parse(AutofillScanner* scanner) {
   // Exclude e.g. "username" or "nickname" fields.
   scanner->SaveCursor();
   bool should_ignore = ParseField(scanner, UTF8ToUTF16(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".
   AutofillField* field = NULL;
   if (ParseField(scanner, UTF8ToUTF16(kNameRe), &field))
     return make_scoped_ptr(new FullNameField(field));
 
   return NULL;
 }
 
 bool FullNameField::ClassifyField(ServerFieldTypeMap* map) const {
   return AddClassification(field_, NAME_FULL, map);
 }
 
+size_t FullNameField::FieldCount() const {
+  return 1;
+}
+
 FullNameField::FullNameField(AutofillField* field) : field_(field) {
+  DCHECK(field);
 }
 
 scoped_ptr<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();
 
   AutofillField* next = NULL;
@@ skipping 94 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;
 }
 
+size_t FirstLastNameField::FieldCount() const {
+  size_t count = 0;
+
+  if (first_name_)
+    ++count;
+  if (middle_name_)
+    ++count;
+  if (last_name_)
+    ++count;
+
+  return count;
+}
+
 }  // namespace autofill