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

components/autofill/core/browser/address_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/address_field.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 108 matching lines @@
          AddClassification(address1_, ADDRESS_HOME_LINE1, map) &&
          AddClassification(address2_, ADDRESS_HOME_LINE2, map) &&
          AddClassification(address3_, ADDRESS_HOME_LINE3, map) &&
          AddClassification(street_address_, ADDRESS_HOME_STREET_ADDRESS, map) &&
          AddClassification(city_, ADDRESS_HOME_CITY, map) &&
          AddClassification(state_, ADDRESS_HOME_STATE, map) &&
          AddClassification(zip_, ADDRESS_HOME_ZIP, map) &&
          AddClassification(country_, ADDRESS_HOME_COUNTRY, map);
 }
 
+size_t AddressField::FieldCount() const {
+  size_t count = 0;
+
+  if (company_)
+    ++count;
+  if (address1_)
+    ++count;
+  if (address2_)
+    ++count;
+  if (address3_)
+    ++count;
+  if (street_address_)
+    ++count;
+  if (city_)
+    ++count;
+  if (state_)
+    ++count;
+  if (zip_)
+    ++count;
+  if (zip4_)
+    ++count;
+  if (country_)
+    ++count;
+
+  return count;;

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

nit: ;;

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

Done.

+}
+
 bool AddressField::ParseCompany(AutofillScanner* scanner) {
   if (company_ && !company_->IsEmpty())
     return false;
 
   return ParseField(scanner, UTF8ToUTF16(kCompanyRe), &company_);
 }
 
 bool AddressField::ParseAddressLines(AutofillScanner* scanner) {
   // We only match the string "address" in page text, not in element names,
   // because sometimes every element in a group of address fields will have
@@ skipping 108 matching lines @@
   if (state_)
     return false;
 
   return ParseFieldSpecifics(scanner,
                              UTF8ToUTF16(kStateRe),
                              MATCH_DEFAULT | MATCH_SELECT,
                              &state_);
 }
 
 }  // namespace autofill