Change heuristic regex and order to match grabber-continental.

chrome/browser/autofill/credit_card_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/credit_card_field.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 117 matching lines @@
       // Toolbar Bug 51451: indeed, simply matching "month" is too general for
       //   https://rps.fidelity.com/ftgw/rps/RtlCust/CreatePIN/Init.
       // Instead, we match only words beginning with "month".
       if (is_ecml)
         pattern = GetEcmlPattern(kEcmlCardExpireMonth);
       else
         pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_EXPIRATION_MONTH_RE);
 
       if ((!credit_card_field->expiration_month_ ||
            credit_card_field->expiration_month_->IsEmpty()) &&
-          ParseText(scanner, pattern, &credit_card_field->expiration_month_)) {
+          ParseText(scanner, FormField::Pattern(pattern, true),
+                    &credit_card_field->expiration_month_)) {
         if (is_ecml)
           pattern = GetEcmlPattern(kEcmlCardExpireYear);
         else
           pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_EXPIRATION_DATE_RE);
 
-        if (!ParseText(scanner, pattern,
+        if (!ParseText(scanner, FormField::Pattern(pattern, true),
                        &credit_card_field->expiration_year_)) {
           scanner->Rewind();
           return NULL;
         }
         continue;
       }
     }
 
-    if (ParseText(scanner, GetEcmlPattern(kEcmlCardExpireDay)))
+    if (ParseText(scanner,
+                  FormField::Pattern(GetEcmlPattern(kEcmlCardExpireDay), true)))
       continue;
 
     // Some pages (e.g. ExpediaBilling.html) have a "card description"
     // field; we parse this field but ignore it.
     // We also ignore any other fields within a credit card block that
     // start with "card", under the assumption that they are related to
     // the credit card section being processed but are uninteresting to us.
     if (ParseText(scanner,
                   l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_IGNORED_RE)))
       continue;
@@ skipping 29 matching lines @@
 
 CreditCardField::CreditCardField()
     : cardholder_(NULL),
       cardholder_last_(NULL),
       type_(NULL),
       number_(NULL),
       verification_(NULL),
       expiration_month_(NULL),
       expiration_year_(NULL) {
 }