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

chrome/browser/autofill/form_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/form_field.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/address_field.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_regexes.h"
 #include "chrome/browser/autofill/autofill_scanner.h"
 #include "chrome/browser/autofill/credit_card_field.h"
 #include "chrome/browser/autofill/email_field.h"
 #include "chrome/browser/autofill/field_types.h"
 #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 {
 
 bool IsTextField(const std::string& type) {
   return type == "text";
 }
 
 bool IsEmailField(const std::string& type) {
   return type == "email";
@@ skipping 21 matching lines @@
   std::copy(fields.begin(), fields.end(), remaining_fields.begin());
 
   // Ignore checkable fields as they interfere with parsers assuming context.
   // Eg., while parsing address, "Is PO box" checkbox after ADDRESS_LINE1
   // interferes with correctly understanding ADDRESS_LINE2.
   remaining_fields.erase(
       std::remove_if(remaining_fields.begin(), remaining_fields.end(),
                      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
 bool FormField::ParseField(AutofillScanner* scanner,
                            const string16& pattern,
                            const AutofillField** match) {
   return ParseFieldSpecifics(scanner, pattern, MATCH_DEFAULT, match);
 }
 
 // static
@@ skipping 76 matching lines @@
   if ((match_type & FormField::MATCH_VALUE) &&
       autofill::MatchesPattern(field->value, pattern)) {
     return true;
   }
 
   return false;
 }
 
 // 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.
   std::vector<const AutofillField*> remaining_fields;
 
   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();
       continue;
     }
 
     // Add entries into the map for each field type found in |form_field|.
     bool ok = form_field->ClassifyField(map);
     DCHECK(ok);
   }
 
   std::swap(*fields, remaining_fields);
 }