[Autofill] Enable heuristic detection of credit card issuer fields.

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"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_regex_constants.h"
 #include "chrome/browser/autofill/autofill_scanner.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // static
-FormField* CreditCardField::Parse(AutofillScanner* scanner,
-                                  bool parse_new_field_types) {
+FormField* CreditCardField::Parse(AutofillScanner* scanner) {
   if (scanner->IsEnd())
     return NULL;
 
   scoped_ptr<CreditCardField> credit_card_field(new CreditCardField);
   size_t saved_cursor = scanner->SaveCursor();
 
   // Credit card fields can appear in many different orders.
   // We loop until no more credit card related fields are found, see |break| at
   // bottom of the loop.
   for (int fields = 0; !scanner->IsEnd(); ++fields) {
@@ skipping 28 matching lines @@
       if (ParseField(scanner, ASCIIToUTF16("^cfnm"), &first) &&
           ParseField(scanner, ASCIIToUTF16("^clnm"),
                      &credit_card_field->cardholder_last_)) {
         credit_card_field->cardholder_ = first;
         continue;
       }
       scanner->Rewind();
     }
 
     // Check for a credit card type (Visa, MasterCard, etc.) field.
-    if (parse_new_field_types) {
-      string16 type_pattern = UTF8ToUTF16(autofill::kCardTypeRe);
-      if (!credit_card_field->type_ &&
-          ParseFieldSpecifics(scanner, type_pattern,
-                              MATCH_DEFAULT | MATCH_SELECT,
-                              &credit_card_field->type_)) {
-        continue;
-      }
+    string16 type_pattern = UTF8ToUTF16(autofill::kCardTypeRe);
+    if (!credit_card_field->type_ &&
+        ParseFieldSpecifics(scanner, type_pattern,
+                            MATCH_DEFAULT | MATCH_SELECT,
+                            &credit_card_field->type_)) {
+      continue;
     }
 
     // We look for a card security code before we look for a credit
     // card number and match the general term "number".  The security code
     // has a plethora of names; we've seen "verification #",
     // "verification number", "card identification number" and others listed
     // in the |pattern| below.
     string16 pattern = UTF8ToUTF16(autofill::kCardCvcRe);
     if (!credit_card_field->verification_ &&
         ParseField(scanner, pattern, &credit_card_field->verification_)) {
@@ skipping 134 matching lines @@
                                    map);
     } else {
       ok = ok && AddClassification(expiration_year_,
                                    CREDIT_CARD_EXP_4_DIGIT_YEAR,
                                    map);
     }
   }
 
   return ok;
 }