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

components/autofill/browser/address_field.cc

 // Copyright (c) 2011 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/browser/address_field.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 209 matching lines @@
   // Some pages have 3 address lines (eg SharperImageModifyAccount.html)
   // Some pages even have 4 address lines (e.g. uk/ShoesDirect2.html)!
   pattern = UTF8ToUTF16(autofill::kAddressLine2Re);
   label_pattern = UTF8ToUTF16(autofill::kAddressLine2LabelRe);
   if (!ParseEmptyLabel(scanner, &address_field->address2_) &&
       !ParseField(scanner, pattern, &address_field->address2_)) {
     ParseFieldSpecifics(scanner, label_pattern, MATCH_LABEL | MATCH_TEXT,
                         &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;
 }
 
 // static
 bool AddressField::ParseCountry(AutofillScanner* scanner,
                                 AddressField* address_field) {
   // Parse a country.  The occasional page (e.g.
   // Travelocity_New Member Information1.html) calls this a "location".
@@ skipping 86 matching lines @@
   if (bill == base::string16::npos && ship != base::string16::npos)
     return kShippingAddress;
 
   if (bill > ship)
     return kBillingAddress;
 
   return kShippingAddress;
 }
 
 }  // namespace autofill