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

chrome/browser/autofill/name_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/name_field.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/autofill/autofill_ecml.h"
 #include "chrome/browser/autofill/autofill_scanner.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "grit/autofill_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-using autofill::GetEcmlPattern;
-
 namespace {
 
 // A form field that can parse a full name field.
 class FullNameField : public NameField {
  public:
   static FullNameField* Parse(AutofillScanner* scanner);
 
  protected:
   // FormField:
   virtual bool ClassifyField(FieldTypeMap* map) const OVERRIDE;
 
  private:
   explicit FullNameField(const AutofillField* field);
 
   const AutofillField* field_;
 
   DISALLOW_COPY_AND_ASSIGN(FullNameField);
 };
 
 // A form field that can parse a first and last name field.
 class FirstLastNameField : public NameField {
  public:
   static FirstLastNameField* ParseSpecificName(AutofillScanner* scanner);
   static FirstLastNameField* ParseComponentNames(AutofillScanner* scanner);
-  static FirstLastNameField* ParseEcmlName(AutofillScanner* scanner);
-  static FirstLastNameField* Parse(AutofillScanner* scanner, bool is_ecml);
+  static FirstLastNameField* Parse(AutofillScanner* scanner);
 
  protected:
   // FormField:
   virtual bool ClassifyField(FieldTypeMap* map) const OVERRIDE;
 
  private:
   FirstLastNameField();
 
   const AutofillField* first_name_;
   const AutofillField* middle_name_;  // Optional.
   const AutofillField* last_name_;
   bool middle_initial_;  // True if middle_name_ is a middle initial.
 
   DISALLOW_COPY_AND_ASSIGN(FirstLastNameField);
 };
 
 }  // namespace
 
-FormField* NameField::Parse(AutofillScanner* scanner, bool is_ecml) {
+FormField* NameField::Parse(AutofillScanner* scanner) {
   if (scanner->IsEnd())
     return NULL;
 
   // Try FirstLastNameField first since it's more specific.
-  NameField* field = FirstLastNameField::Parse(scanner, is_ecml);
-  if (!field && !is_ecml)
+  NameField* field = FirstLastNameField::Parse(scanner);
+  if (!field)
     field = FullNameField::Parse(scanner);
   return field;
 }
 
 // This is overriden in concrete subclasses.
 bool NameField::ClassifyField(FieldTypeMap* map) const {
   return false;
 }
 
 FullNameField* FullNameField::Parse(AutofillScanner* scanner) {
@@ skipping 115 matching lines @@
 
   // Consider the match to be successful if we detected both first and last name
   // fields.
   if (v->first_name_ && v->last_name_)
     return v.release();
 
   scanner->Rewind();
   return NULL;
 }
 
-FirstLastNameField* FirstLastNameField::ParseEcmlName(
-    AutofillScanner* scanner) {
-  scoped_ptr<FirstLastNameField> field(new FirstLastNameField);
-  scanner->SaveCursor();
-
-  string16 pattern = GetEcmlPattern(kEcmlShipToFirstName,
-                                    kEcmlBillToFirstName, '|');
-  if (!ParseField(scanner, pattern, &field->first_name_))
-    return NULL;
-
-  pattern = GetEcmlPattern(kEcmlShipToMiddleName, kEcmlBillToMiddleName, '|');
-  ParseField(scanner, pattern, &field->middle_name_);
-
-  pattern = GetEcmlPattern(kEcmlShipToLastName, kEcmlBillToLastName, '|');
-  if (ParseField(scanner, pattern, &field->last_name_))
-    return field.release();
-
-  scanner->Rewind();
-  return NULL;
-}
-
-FirstLastNameField* FirstLastNameField::Parse(AutofillScanner* scanner,
-                                              bool is_ecml) {
-  if (is_ecml)
-    return ParseEcmlName(scanner);
-
+FirstLastNameField* FirstLastNameField::Parse(AutofillScanner* scanner) {
   FirstLastNameField* field = ParseSpecificName(scanner);
   if (!field)
     field = ParseComponentNames(scanner);
   return field;
 }
 
 FirstLastNameField::FirstLastNameField()
     : first_name_(NULL),
       middle_name_(NULL),
       last_name_(NULL),
       middle_initial_(false) {
 }
 
 bool FirstLastNameField::ClassifyField(FieldTypeMap* map) const {
   bool ok = AddClassification(first_name_, NAME_FIRST, map);
   ok = ok && AddClassification(last_name_, NAME_LAST, map);
   AutofillFieldType type = middle_initial_ ? NAME_MIDDLE_INITIAL : NAME_MIDDLE;
   ok = ok && AddClassification(middle_name_, type, map);
   return ok;
 }