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

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_ecml.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_scanner.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "grit/autofill_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-using autofill::GetEcmlPattern;
-
 // static
-FormField* CreditCardField::Parse(AutofillScanner* scanner,
-                                        bool is_ecml) {
+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) {
     // Sometimes the cardholder field is just labeled "name". Unfortunately this
     // is a dangerously generic word to search for, since it will often match a
     // name (not cardholder name) field before or after credit card fields. So
     // we search for "name" only when we've already parsed at least one other
     // credit card field and haven't yet parsed the expiration date (which
     // usually appears at the end).
     if (credit_card_field->cardholder_ == NULL) {
       string16 name_pattern;
-      if (is_ecml) {
-        name_pattern = GetEcmlPattern(kEcmlCardHolder);
+      if (fields == 0 || credit_card_field->expiration_month_) {
+        // at beginning or end
+        name_pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_NAME_ON_CARD_RE);
       } else {
-        if (fields == 0 || credit_card_field->expiration_month_) {
-          // at beginning or end
-          name_pattern = l10n_util::GetStringUTF16(
-              IDS_AUTOFILL_NAME_ON_CARD_RE);
-        } else {
-          name_pattern = l10n_util::GetStringUTF16(
-              IDS_AUTOFILL_NAME_ON_CARD_CONTEXTUAL_RE);
-        }
+        name_pattern = l10n_util::GetStringUTF16(
+            IDS_AUTOFILL_NAME_ON_CARD_CONTEXTUAL_RE);
       }
 
       if (ParseField(scanner, name_pattern, &credit_card_field->cardholder_))
         continue;
 
       // As a hard-coded hack for Expedia's billing pages (expedia_checkout.html
       // and ExpediaBilling.html in our test suite), recognize separate fields
       // for the cardholder's first and last name if they have the labels "cfnm"
       // and "clnm".
       scanner->SaveCursor();
       const AutofillField* first;
-      if (!is_ecml && ParseField(scanner, ASCIIToUTF16("^cfnm"), &first) &&
+      if (ParseField(scanner, ASCIIToUTF16("^cfnm"), &first) &&
           ParseField(scanner, ASCIIToUTF16("^clnm"),
                      &credit_card_field->cardholder_last_)) {
         credit_card_field->cardholder_ = first;
         continue;
       }
       scanner->Rewind();
     }
 
     // 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;
-    if (is_ecml)
-      pattern = GetEcmlPattern(kEcmlCardVerification);
-    else
-      pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_CVC_RE);
-
+    string16 pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_CVC_RE);
     if (!credit_card_field->verification_ &&
         ParseField(scanner, pattern, &credit_card_field->verification_)) {
       continue;
     }
     // TODO(jhawkins): Parse the type select control.
 
-    if (is_ecml)
-      pattern = GetEcmlPattern(kEcmlCardNumber);
-    else
-      pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_NUMBER_RE);
-
+    pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_NUMBER_RE);
     if (!credit_card_field->number_ &&
         ParseField(scanner, pattern, &credit_card_field->number_)) {
       continue;
     }
 
     if (LowerCaseEqualsASCII(scanner->Cursor()->form_control_type, "month")) {
       credit_card_field->expiration_month_ = scanner->Cursor();
       scanner->Advance();
     } else {
       // "Expiration date" is the most common label here, but some pages have
       // "Expires", "exp. date" or "exp. month" and "exp. year".  We also look
       // for the field names ccmonth and ccyear, which appear on at least 4 of
       // our test pages.
       //
       // -> On at least one page (The China Shop2.html) we find only the labels
       // "month" and "year".  So for now we match these words directly; we'll
       // see if this turns out to be too general.
       //
       // Toolbar Bug 51451: indeed, simply matching "month" is too general for
       //   https://rps.fidelity.com/ftgw/rps/RtlCust/CreatePIN/Init.
       // Instead, we match only words beginning with "month".
-      if (is_ecml)
-        pattern = GetEcmlPattern(kEcmlCardExpireMonth);
-      else
-        pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_EXPIRATION_MONTH_RE);
-
+      pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_EXPIRATION_MONTH_RE);
       if ((!credit_card_field->expiration_month_ ||
            credit_card_field->expiration_month_->IsEmpty()) &&
           ParseFieldSpecifics(scanner, pattern, MATCH_DEFAULT | MATCH_SELECT,
                               &credit_card_field->expiration_month_)) {
-        if (is_ecml)
-          pattern = GetEcmlPattern(kEcmlCardExpireYear);
-        else
-          pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_EXPIRATION_DATE_RE);
-
+        pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_EXPIRATION_DATE_RE);
         if (!ParseFieldSpecifics(scanner, pattern, MATCH_DEFAULT | MATCH_SELECT,
                                  &credit_card_field->expiration_year_)) {
           scanner->RewindTo(saved_cursor);
           return NULL;
         }
         continue;
       }
     }
 
-    if (ParseFieldSpecifics(scanner, GetEcmlPattern(kEcmlCardExpireDay),
-                            MATCH_DEFAULT | MATCH_SELECT, NULL)) {
-      continue;
-    }
-
     // Some pages (e.g. ExpediaBilling.html) have a "card description"
     // field; we parse this field but ignore it.
     // We also ignore any other fields within a credit card block that
     // start with "card", under the assumption that they are related to
     // the credit card section being processed but are uninteresting to us.
     if (ParseField(scanner,
                    l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_IGNORED_RE),
                    NULL)) {
       continue;
     }
@@ skipping 47 matching lines @@
   if (cardholder_last_ == NULL)
     ok = ok && AddClassification(cardholder_, CREDIT_CARD_NAME, map);
 
   ok = ok && AddClassification(type_, CREDIT_CARD_TYPE, map);
   ok = ok && AddClassification(expiration_month_, CREDIT_CARD_EXP_MONTH, map);
   ok = ok && AddClassification(expiration_year_,
                                CREDIT_CARD_EXP_4_DIGIT_YEAR,
                                map);
   return ok;
 }