AutoFill: Fix two heuristic issues with nrm.org.

chrome/browser/autofill/address_field.cc

 // Copyright (c) 2010 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 "chrome/browser/autofill/address_field.h"
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
@@ skipping 73 matching lines @@
   // The ECML standard uses 2 letter country codes.  So we will
   // have to remember that this is an ECML form, for when we fill
   // it out.
   address_field->is_ecml_ = is_ecml;
 
   // Allow address fields to appear in any order.
   while (true) {
     if (ParseCompany(&q, is_ecml, address_field.get()) ||
         ParseAddressLines(&q, is_ecml, address_field.get()) ||
         ParseCity(&q, is_ecml, address_field.get()) ||
+        ParseState(&q, is_ecml, address_field.get()) ||
         ParseZipCode(&q, is_ecml, address_field.get()) ||
         ParseCountry(&q, is_ecml, address_field.get())) {
       continue;
-    } else if ((!address_field->state_ || address_field->state_->IsEmpty()) &&
-               address_field->ParseState(&q, is_ecml, address_field.get())) {
-      continue;
     } else if (ParseText(&q, ASCIIToUTF16("attention|attn.")) ||
                ParseText(&q, ASCIIToUTF16("province|region|other"))) {
       // We ignore the following:
       // * Attention.
       // * Province/Region/Other.
       continue;
     } else if (*q != **iter && ParseEmpty(&q)) {
       // Ignore non-labeled fields within an address; the page
       // MapQuest Driving Directions North America.html contains such a field.
       // We only ignore such fields after we've parsed at least one other field;
@@ skipping 222 matching lines @@
     pattern = GetEcmlPattern(kEcmlShipToCity, kEcmlBillToCity, '|');
   else
     pattern = ASCIIToUTF16("city|town");
 
   if (!ParseText(iter, pattern, &address_field->city_))
     return false;
 
   return true;
 }
 
+// static
 bool AddressField::ParseState(
     std::vector<AutoFillField*>::const_iterator* iter,
     bool is_ecml, AddressField* address_field) {
+  if (address_field->state_)

[Ilya Sherman, 2010/11/02 15:35:08]

nit: Do we not want "&& !address_field->state_->IsEmpty()" here, as we had in
the previous logic?

[James Hawkins, 2010/11/02 17:32:14]

No. I don't know why it was written in the first place, but it's wrong, because
the type of a field shouldn't depend on the emptiness of the value of the field.

+    return false;
+
   string16 pattern;
   if (is_ecml)
     pattern = GetEcmlPattern(kEcmlShipToStateProv, kEcmlBillToStateProv, '|');
   else
     pattern = ASCIIToUTF16("state|county");
 
   if (!ParseText(iter, pattern, &address_field->state_))
     return false;
 
   return true;
@@ skipping 21 matching lines @@
     return kBillingAddress;
 
   if (bill == string16::npos && ship != string16::npos)
     return kShippingAddress;
 
   if (bill > ship)
     return kBillingAddress;
 
   return kShippingAddress;
 }