Fix AddressField "lookup" fields ignore logic.

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 <utility>
 
 #include "base/logging.h"
@@ skipping 39 matching lines @@
   size_t saved_cursor = scanner->SaveCursor();
 
   base::string16 attention_ignored = UTF8ToUTF16(kAttentionIgnoredRe);
   base::string16 region_ignored = UTF8ToUTF16(kRegionIgnoredRe);
 
   // Allow address fields to appear in any order.
   size_t begin_trailing_non_labeled_fields = 0;
   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)) {
       has_trailing_non_labeled_fields = false;
       continue;
     } else if (ParseField(scanner, attention_ignored, NULL) ||
                ParseField(scanner, region_ignored, NULL)) {
       // We ignore the following:
       // * Attention.
       // * Province/Region/Other.
@@ skipping 96 matching lines @@
   // because sometimes every element in a group of address fields will have
   // a name containing the string "address"; for example, on the page
   // Kohl's - Register Billing Address.html the text element labeled "city"
   // has the name "BILL_TO_ADDRESS<>city".  We do match address labels
   // such as "address1", which appear as element names on various pages (eg
   // AmericanGirl-Registration.html, BloomingdalesBilling.html,
   // EBay Registration Enter Information.html).
   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_) &&
       !ParseFieldSpecifics(scanner, label_pattern, MATCH_LABEL | MATCH_TEXT,
                            &address1_) &&
       !ParseFieldSpecifics(scanner, pattern, MATCH_DEFAULT | MATCH_TEXT_AREA,
                            &street_address_) &&
       !ParseFieldSpecifics(scanner, label_pattern,
                            MATCH_LABEL | MATCH_TEXT_AREA,
                            &street_address_))
@@ skipping 222 matching lines @@
 AddressField::ParseNameLabelResult AddressField::ParseNameAndLabelForState(
     AutofillScanner* scanner) {
   if (state_)
     return RESULT_MATCH_NONE;
 
   return ParseNameAndLabelSeparately(
       scanner, UTF8ToUTF16(kStateRe), kStateMatchType, &state_);
 }
 
 }  // namespace autofill