| 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..e9f0044f94ad0358380b9b51101a6c86739228e8 100644
|
| --- a/components/autofill/browser/address_field.cc
|
| +++ b/components/autofill/browser/address_field.cc
|
| @@ -227,10 +227,12 @@ 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);
|
| + pattern = UTF8ToUTF16(autofill::kAddressLinesExtraRe);
|
| + while (ParseField(scanner, pattern, NULL)) {
|
| + // Consumed a surplus line, try for another.
|
| + }
|
| }
|
|
|
| return true;
|
|
|