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 53 matching lines @@
         begin_trailing_non_labeled_fields = cursor;
       }
 
       continue;
     } else {
       // No field found.
       break;
     }
   }
 
-  // If we have identified any address fields in this field then it should be
-  // added to the list of fields.
-  if (address_field->company_ ||
-      address_field->address1_ ||
-      address_field->address2_ ||
-      address_field->address3_ ||
-      address_field->street_address_ ||
-      address_field->city_ ||
-      address_field->state_ ||
-      address_field->zip_ ||
-      address_field->zip4_ ||
-      address_field->country_) {
+  // If we have identified any non-street address fields in this field then it
+  // should be added to the list of fields. We skip over the case of just having
+  // the street address by itself, because it is way too easy to have a field
+  // with the word "address" in it getting parsed as a street address.
+  // See http://crbug.com/447332
+  bool has_valid_non_street_address_field = (address_field->company_ ||

[Evan Stade, 2015/01/15 04:11:37]

nit: I think we should require at least three recognized address fields (not
just two).

[Evan Stade, 2015/01/15 04:12:23]

also, as this code is written, wouldn't the bug still occur for a docs comment
that says "State"?

+                                             address_field->city_ ||
+                                             address_field->state_ ||
+                                             address_field->zip_ ||
+                                             address_field->zip4_ ||
+                                             address_field->country_);
+  if (has_valid_non_street_address_field) {
     // Don't slurp non-labeled fields at the end into the address.
     if (has_trailing_non_labeled_fields)
       scanner->RewindTo(begin_trailing_non_labeled_fields);
 
     return address_field.Pass();
   }
 
   scanner->RewindTo(saved_cursor);
   return NULL;
 }
@@ skipping 151 matching lines @@
   if (state_)
     return false;
 
   return ParseFieldSpecifics(scanner,
                              UTF8ToUTF16(kStateRe),
                              MATCH_DEFAULT | MATCH_SELECT,
                              &state_);
 }
 
 }  // namespace autofill