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

chrome/browser/autofill/credit_card_field_unittest.cc

Index: chrome/browser/autofill/credit_card_field_unittest.cc
diff --git a/chrome/browser/autofill/credit_card_field_unittest.cc b/chrome/browser/autofill/credit_card_field_unittest.cc
index 2657c0931b2c2e3b5307a145eea7c89cf3599fe4..9ee335d58e0df8e45c1a362325de449a3fb45a6c 100644
--- a/chrome/browser/autofill/credit_card_field_unittest.cc
+++ b/chrome/browser/autofill/credit_card_field_unittest.cc
@@ -22,11 +22,7 @@ class CreditCardFieldTest : public testing::Test {
 
   // Downcast for tests.
   static CreditCardField* Parse(AutofillScanner* scanner) {
-    return
-        static_cast<CreditCardField*>(CreditCardField::Parse(scanner, false));
-  }
-  static CreditCardField* ParseWithNewFieldTypes(AutofillScanner* scanner) {
-    return static_cast<CreditCardField*>(CreditCardField::Parse(scanner, true));
+    return static_cast<CreditCardField*>(CreditCardField::Parse(scanner));
   }
 
  private:
@@ -141,60 +137,6 @@ TEST_F(CreditCardFieldTest, ParseFullCreditCard) {
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
   ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("name")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name")]);
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("number")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number")]);
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("month")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month")]);
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("year")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
-      field_type_map_[ASCIIToUTF16("year")]);
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("cvc")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_VERIFICATION_CODE,
-      field_type_map_[ASCIIToUTF16("cvc")]);
-  // We don't fill card types by default.
-  EXPECT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("type")) == field_type_map_.end());
-}
-
-TEST_F(CreditCardFieldTest, ParseCreditCardType) {
-  FormFieldData field;
-  field.form_control_type = "text";
-
-  field.label = ASCIIToUTF16("Card Type");
-  field.name = ASCIIToUTF16("card_type");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("type")));
-
-  field.label = ASCIIToUTF16("Name on Card");
-  field.name = ASCIIToUTF16("name_on_card");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("name")));
-
-  field.label = ASCIIToUTF16("Card Number");
-  field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number")));
-
-  field.label = ASCIIToUTF16("Exp Month");
-  field.name = ASCIIToUTF16("ccmonth");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month")));
-
-  field.label = ASCIIToUTF16("Exp Year");
-  field.name = ASCIIToUTF16("ccyear");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year")));
-
-  field.label = ASCIIToUTF16("Verification");
-  field.name = ASCIIToUTF16("verification");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("cvc")));
-
-  AutofillScanner scanner(list_.get());
-  field_.reset(ParseWithNewFieldTypes(&scanner));
-  ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
-  ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
-  ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("type")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_TYPE, field_type_map_[ASCIIToUTF16("type")]);
   ASSERT_TRUE(