Fix for forms with more than three address lines getting partially Autofilled

components/autofill/browser/address_field.cc

Index: components/autofill/browser/address_field.cc
diff --git a/components/autofill/browser/address_field.cc b/components/autofill/browser/address_field.cc
index 037896d0a4450143e55a8de13b6bac2a7c7960c4..61852a4a651779dc3983dd530b27718fa993dc5d 100644
--- a/components/autofill/browser/address_field.cc
+++ b/components/autofill/browser/address_field.cc
@@ -227,10 +227,11 @@ bool AddressField::ParseAddressLines(AutofillScanner* scanner,
                         &address_field->address2_);
   }
 
-  // Try for a third line, which we will promptly discard.
+  // Try for surplus lines, which we will promptly discard.
   if (address_field->address2_ != NULL) {
-    pattern = UTF8ToUTF16(autofill::kAddressLine3Re);
-    ParseField(scanner, pattern, NULL);
+    do
+      pattern = UTF8ToUTF16(autofill::kAddressLinesExtraRe);
+    while (ParseField(scanner, pattern, NULL));

[Ilya Sherman, 2013/04/17 05:56:33]

nit: Please write this as:

pattern = UTF8ToUTF16(autofill::kAddressLinesExtraRe);
while (ParseField(scanner, pattern, NULL)) {
  // Consumed a surplus line, try for another.
}

Among other things, this has the advantage that it doesn't do the UTF conversion
repeatedly.

[Jim Blackler, 2013/04/18 13:49:22]

Oh yeah it seems I didn't study that closely what pattern= .... actually did.

   }
 
   return true;