Change heuristic regex and order to match grabber-continental.

chrome/browser/autofill/phone_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 "chrome/browser/autofill/phone_field.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
@@ skipping 106 matching lines @@
   }
 
   return NULL;
 }
 
 // static
 PhoneField* PhoneField::ParseECML(AutofillScanner* scanner) {
   string16 pattern(GetEcmlPattern(kEcmlShipToPhone, kEcmlBillToPhone, '|'));
 
   const AutofillField* field;
-  if (ParseText(scanner, pattern, &field)) {
+  if (ParseText(scanner, pattern, MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
+                &field)) {
     PhoneField* phone_field = new PhoneField();
     phone_field->parsed_phone_fields_[FIELD_PHONE] = field;
     return phone_field;
   }
 
   return NULL;
 }
 
 bool PhoneField::GetFieldInfo(FieldTypeMap* field_type_map) const {
   bool ok = true;
@@ skipping 123 matching lines @@
   for (size_t i = 0; i < arraysize(phone_field_grammars_); ++i) {
     memset(parsed_fields, 0, sizeof(parsed_fields));
     scanner->Rewind();
     scanner->SaveCursor();
 
     // Attempt to parse according to the next grammar.
     for (; i < arraysize(phone_field_grammars_) &&
          phone_field_grammars_[i].regex != REGEX_SEPARATOR; ++i) {
       if (!ParseText(scanner,
                      phone_field->GetRegExp(phone_field_grammars_[i].regex),
+                     MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
                      &parsed_fields[phone_field_grammars_[i].phone_part]))
         break;
       if (phone_field_grammars_[i].max_size &&
           (!parsed_fields[phone_field_grammars_[i].phone_part]->max_length ||
             phone_field_grammars_[i].max_size <
             parsed_fields[phone_field_grammars_[i].phone_part]->max_length)) {
         break;
       }
     }
 
@@ skipping 22 matching lines @@
   }
 
   for (int i = 0; i < FIELD_MAX; ++i)
     phone_field->parsed_phone_fields_[i] = parsed_fields[i];
 
   // Look for optional fields.
 
   // Look for a third text box.
   if (!phone_field->parsed_phone_fields_[FIELD_SUFFIX]) {
     if (!ParseText(scanner, phone_field->GetSuffixRegex(),
+                   MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
                    &phone_field->parsed_phone_fields_[FIELD_SUFFIX])) {
       ParseText(scanner, phone_field->GetSuffixSeparatorRegex(),
+                MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
                 &phone_field->parsed_phone_fields_[FIELD_SUFFIX]);
     }
   }
 
   // Now look for an extension.
   ParseText(scanner, phone_field->GetExtensionRegex(),
+            MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
             &phone_field->parsed_phone_fields_[FIELD_EXTENSION]);
 
   return true;
 }
 
 void PhoneField::SetPhoneType(PhoneType phone_type) {
   // Field types are different as well, so we create a temporary phone number,
   // to get relevant field types.
   if (phone_type == HOME_PHONE)
     number_.reset(new HomePhoneNumber);
   else
     number_.reset(new FaxNumber);
   phone_type_ = phone_type;
 }