| Index: components/autofill/core/browser/address_field.cc
|
| diff --git a/components/autofill/core/browser/address_field.cc b/components/autofill/core/browser/address_field.cc
|
| index 7fbc2cfa87111ce413d5734471c08b9ea0231e69..de54d6bd8202e1dbbf17b7fd8f594007520ce0c5 100644
|
| --- a/components/autofill/core/browser/address_field.cc
|
| +++ b/components/autofill/core/browser/address_field.cc
|
| @@ -57,7 +57,10 @@ scoped_ptr<FormField> AddressField::Parse(AutofillScanner* scanner) {
|
| bool has_trailing_non_labeled_fields = false;
|
| while (!scanner->IsEnd()) {
|
| const size_t cursor = scanner->SaveCursor();
|
| - if (address_field->ParseAddressLines(scanner) ||
|
| + // Ignore "Address Lookup" field. http://crbug.com/427622
|
| + if (ParseField(scanner, base::UTF8ToUTF16(kAddressLookupRe), NULL)) {
|
| + continue;
|
| + } else if (address_field->ParseAddressLines(scanner) ||
|
| address_field->ParseCityStateZipCode(scanner) ||
|
| address_field->ParseCountry(scanner) ||
|
| address_field->ParseCompany(scanner)) {
|
| @@ -174,10 +177,6 @@ bool AddressField::ParseAddressLines(AutofillScanner* scanner) {
|
| if (address1_ || street_address_)
|
| return false;
|
|
|
| - // Ignore "Address Lookup" field. http://crbug.com/427622
|
| - if (ParseField(scanner, base::UTF8ToUTF16(kAddressLookupRe), NULL))
|
| - return false;
|
| -
|
| base::string16 pattern = UTF8ToUTF16(kAddressLine1Re);
|
| base::string16 label_pattern = UTF8ToUTF16(kAddressLine1LabelRe);
|
| if (!ParseFieldSpecifics(scanner, pattern, MATCH_DEFAULT, &address1_) &&
|
|
|