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

chrome/browser/autofill/form_field.cc

Index: chrome/browser/autofill/form_field.cc
diff --git a/chrome/browser/autofill/form_field.cc b/chrome/browser/autofill/form_field.cc
index e722c5f071c6f2b4db93031e1b10cb473538635d..ec79ece9d21e05df72dfb96ea6448adfb2e8dca9 100644
--- a/chrome/browser/autofill/form_field.cc
+++ b/chrome/browser/autofill/form_field.cc
@@ -8,7 +8,6 @@
 #include <string>
 #include <utility>
 
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
@@ -24,7 +23,6 @@
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/name_field.h"
 #include "chrome/browser/autofill/phone_field.h"
-#include "chrome/common/chrome_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ -66,29 +64,20 @@ void FormField::ParseFormFields(const std::vector<AutofillField*>& fields,
                      IsCheckable),
       remaining_fields.end());
 
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  bool parse_new_field_types =
-      command_line.HasSwitch(switches::kEnableNewAutofillHeuristics);
-
   // Email pass.
-  ParseFormFieldsPass(EmailField::Parse, parse_new_field_types,
-                      &remaining_fields, map);
+  ParseFormFieldsPass(EmailField::Parse, &remaining_fields, map);
 
   // Phone pass.
-  ParseFormFieldsPass(PhoneField::Parse, parse_new_field_types,
-                      &remaining_fields, map);
+  ParseFormFieldsPass(PhoneField::Parse, &remaining_fields, map);
 
   // Address pass.
-  ParseFormFieldsPass(AddressField::Parse, parse_new_field_types,
-                      &remaining_fields, map);
+  ParseFormFieldsPass(AddressField::Parse, &remaining_fields, map);
 
   // Credit card pass.
-  ParseFormFieldsPass(CreditCardField::Parse, parse_new_field_types,
-                      &remaining_fields, map);
+  ParseFormFieldsPass(CreditCardField::Parse, &remaining_fields, map);
 
   // Name pass.
-  ParseFormFieldsPass(NameField::Parse, parse_new_field_types,
-                      &remaining_fields, map);
+  ParseFormFieldsPass(NameField::Parse, &remaining_fields, map);
 }
 
 // static
@@ -185,7 +174,6 @@ bool FormField::Match(const AutofillField* field,
 
 // static
 void FormField::ParseFormFieldsPass(ParseFunction parse,
-                                    bool parse_new_field_types,
                                     std::vector<const AutofillField*>* fields,
                                     FieldTypeMap* map) {
   // Store unmatched fields for further processing by the caller.
@@ -193,7 +181,7 @@ void FormField::ParseFormFieldsPass(ParseFunction parse,
 
   AutofillScanner scanner(*fields);
   while (!scanner.IsEnd()) {
-    scoped_ptr<FormField> form_field(parse(&scanner, parse_new_field_types));
+    scoped_ptr<FormField> form_field(parse(&scanner));
     if (!form_field.get()) {
       remaining_fields.push_back(scanner.Cursor());
       scanner.Advance();