Remove Autofill support for the ECML standard, as it is virtually unused.

BUG=91873
TEST=none

Review URL: http://codereview.chromium.org/7585020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95865 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/autofill/credit_card_field_unittest.cc b/chrome/browser/autofill/credit_card_field_unittest.cc
index c65a5bc..f480783 100644
--- a/chrome/browser/autofill/credit_card_field_unittest.cc
+++ b/chrome/browser/autofill/credit_card_field_unittest.cc
@@ -5,7 +5,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/autofill/autofill_ecml.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_scanner.h"
 #include "chrome/browser/autofill/credit_card_field.h"
@@ -22,9 +21,8 @@
   FieldTypeMap field_type_map_;
 
   // Downcast for tests.
-  static CreditCardField* Parse(AutofillScanner* scanner, bool is_ecml) {
-    return static_cast<CreditCardField*>(
-        CreditCardField::Parse(scanner, is_ecml));
+  static CreditCardField* Parse(AutofillScanner* scanner) {
+    return static_cast<CreditCardField*>(CreditCardField::Parse(scanner));
   }
 
  private:
@@ -33,14 +31,14 @@
 
 TEST_F(CreditCardFieldTest, Empty) {
   AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
+  field_.reset(Parse(&scanner));
   ASSERT_EQ(static_cast<CreditCardField*>(NULL), field_.get());
 }
 
 TEST_F(CreditCardFieldTest, NonParse) {
   list_.push_back(new AutofillField);
   AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
+  field_.reset(Parse(&scanner));
   ASSERT_EQ(static_cast<CreditCardField*>(NULL), field_.get());
 }
 
@@ -62,7 +60,7 @@
                                                false),
                         ASCIIToUTF16("year1")));
   AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
+  field_.reset(Parse(&scanner));
   ASSERT_EQ(static_cast<CreditCardField*>(NULL), field_.get());
 }
 
@@ -76,7 +74,7 @@
                                                false),
                         ASCIIToUTF16("number1")));
   AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
+  field_.reset(Parse(&scanner));
   ASSERT_EQ(static_cast<CreditCardField*>(NULL), field_.get());
 }
 
@@ -106,50 +104,7 @@
                                                false),
                         ASCIIToUTF16("year1")));
   AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
-  ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
-  ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("number1")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number1")]);
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("month1")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month1")]);
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("year1")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
-      field_type_map_[ASCIIToUTF16("year1")]);
-}
-
-TEST_F(CreditCardFieldTest, ParseMiniumCreditCardEcml) {
-  list_.push_back(
-      new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Card Number"),
-                                               ASCIIToUTF16(kEcmlCardNumber),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false),
-                        ASCIIToUTF16("number1")));
-  list_.push_back(
-      new AutofillField(
-          webkit_glue::FormField(ASCIIToUTF16("Exp Month"),
-                                 ASCIIToUTF16(kEcmlCardExpireMonth),
-                                 string16(),
-                                 ASCIIToUTF16("text"),
-                                 0,
-                                 false),
-          ASCIIToUTF16("month1")));
-  list_.push_back(
-      new AutofillField(
-          webkit_glue::FormField(ASCIIToUTF16("Exp Year"),
-                                 ASCIIToUTF16(kEcmlCardExpireYear),
-                                 string16(),
-                                 ASCIIToUTF16("text"),
-                                 0,
-                                 false),
-          ASCIIToUTF16("year1")));
-  AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
+  field_.reset(Parse(&scanner));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
   ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
@@ -206,7 +161,7 @@
                                                false),
                         ASCIIToUTF16("cvc1")));
   AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
+  field_.reset(Parse(&scanner));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
   ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
@@ -227,72 +182,6 @@
       field_type_map_.find(ASCIIToUTF16("cvc1")) == field_type_map_.end());
 }
 
-TEST_F(CreditCardFieldTest, ParseFullCreditCardEcml) {
-  list_.push_back(
-      new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Name on Card"),
-                                               ASCIIToUTF16(kEcmlCardHolder),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false),
-                        ASCIIToUTF16("name1")));
-  list_.push_back(
-      new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Card Number"),
-                                               ASCIIToUTF16(kEcmlCardNumber),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false),
-                        ASCIIToUTF16("number1")));
-  list_.push_back(
-      new AutofillField(
-          webkit_glue::FormField(ASCIIToUTF16("Exp Month"),
-                                 ASCIIToUTF16(kEcmlCardExpireMonth),
-                                 string16(),
-                                 ASCIIToUTF16("text"),
-                                 0,
-                                 false),
-          ASCIIToUTF16("month1")));
-  list_.push_back(
-      new AutofillField(
-          webkit_glue::FormField(ASCIIToUTF16("Exp Year"),
-                                 ASCIIToUTF16(kEcmlCardExpireYear),
-                                 string16(),
-                                 ASCIIToUTF16("text"),
-                                 0,
-                                 false),
-          ASCIIToUTF16("year1")));
-  list_.push_back(
-      new AutofillField(
-          webkit_glue::FormField(ASCIIToUTF16("Verification"),
-                                 ASCIIToUTF16(kEcmlCardVerification),
-                                 string16(),
-                                 ASCIIToUTF16("text"),
-                                 0,
-                                 false),
-          ASCIIToUTF16("cvc1")));
-  AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
-  ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
-  ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name1")]);
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("number1")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number1")]);
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("month1")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month1")]);
-  ASSERT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("year1")) != field_type_map_.end());
-  EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
-      field_type_map_[ASCIIToUTF16("year1")]);
-  // We don't store the CVV.
-  EXPECT_TRUE(
-      field_type_map_.find(ASCIIToUTF16("cvc1")) == field_type_map_.end());
-}
-
 TEST_F(CreditCardFieldTest, ParseExpMonthYear) {
   list_.push_back(
       new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Name on Card"),
@@ -329,7 +218,7 @@
                                  false),
           ASCIIToUTF16("year")));
   AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
+  field_.reset(Parse(&scanner));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
   ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
@@ -383,7 +272,7 @@
                                  false),
           ASCIIToUTF16("year")));
   AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
+  field_.reset(Parse(&scanner));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
   ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
@@ -411,7 +300,7 @@
                                                false),
                         ASCIIToUTF16("name1")));
   AutofillScanner scanner(list_.get());
-  field_.reset(Parse(&scanner, false));
+  field_.reset(Parse(&scanner));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
   ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(