| Index: chrome/browser/autofill/form_field.cc
|
| diff --git a/chrome/browser/autofill/form_field.cc b/chrome/browser/autofill/form_field.cc
|
| index edcd292abff93b2c487f40220279ec0c16ae222e..3505d15f054c080ef282aa7381f6465d583d1d09 100644
|
| --- a/chrome/browser/autofill/form_field.cc
|
| +++ b/chrome/browser/autofill/form_field.cc
|
| @@ -13,7 +13,6 @@
|
| #include "base/string_util.h"
|
| #include "base/stringprintf.h"
|
| #include "base/utf_string_conversions.h"
|
| -#include "chrome/browser/autofill/autofill_ecml.h"
|
| #include "chrome/browser/autofill/address_field.h"
|
| #include "chrome/browser/autofill/autofill_field.h"
|
| #include "chrome/browser/autofill/autofill_regexes.h"
|
| @@ -29,9 +28,6 @@
|
|
|
| namespace {
|
|
|
| -using autofill::GetEcmlPattern;
|
| -using autofill::HasECMLField;
|
| -
|
| bool IsTextField(const string16& type) {
|
| return type == ASCIIToUTF16("text");
|
| }
|
| @@ -53,28 +49,24 @@ bool IsSelectField(const string16& type) {
|
| // static
|
| void FormField::ParseFormFields(const std::vector<AutofillField*>& fields,
|
| FieldTypeMap* map) {
|
| - // First, check if there is at least one form field with an ECML name.
|
| - // If there is, then we will match an element only if it is in the standard.
|
| - bool is_ecml = HasECMLField(fields);
|
| -
|
| // Set up a working copy of the fields to be processed.
|
| std::vector<const AutofillField*> remaining_fields(fields.size());
|
| std::copy(fields.begin(), fields.end(), remaining_fields.begin());
|
|
|
| // Email pass.
|
| - ParseFormFieldsPass(EmailField::Parse, is_ecml, &remaining_fields, map);
|
| + ParseFormFieldsPass(EmailField::Parse, &remaining_fields, map);
|
|
|
| // Phone/fax pass.
|
| - ParseFormFieldsPass(PhoneField::Parse, is_ecml, &remaining_fields, map);
|
| + ParseFormFieldsPass(PhoneField::Parse, &remaining_fields, map);
|
|
|
| // Address pass.
|
| - ParseFormFieldsPass(AddressField::Parse, is_ecml, &remaining_fields, map);
|
| + ParseFormFieldsPass(AddressField::Parse, &remaining_fields, map);
|
|
|
| // Credit card pass.
|
| - ParseFormFieldsPass(CreditCardField::Parse, is_ecml, &remaining_fields, map);
|
| + ParseFormFieldsPass(CreditCardField::Parse, &remaining_fields, map);
|
|
|
| // Name pass.
|
| - ParseFormFieldsPass(NameField::Parse, is_ecml, &remaining_fields, map);
|
| + ParseFormFieldsPass(NameField::Parse, &remaining_fields, map);
|
| }
|
|
|
| // static
|
| @@ -171,7 +163,6 @@ bool FormField::Match(const AutofillField* field,
|
|
|
| // static
|
| void FormField::ParseFormFieldsPass(ParseFunction parse,
|
| - bool is_ecml,
|
| std::vector<const AutofillField*>* fields,
|
| FieldTypeMap* map) {
|
| // Store unmatched fields for further processing by the caller.
|
| @@ -179,7 +170,7 @@ void FormField::ParseFormFieldsPass(ParseFunction parse,
|
|
|
| AutofillScanner scanner(*fields);
|
| while (!scanner.IsEnd()) {
|
| - scoped_ptr<FormField> form_field(parse(&scanner, is_ecml));
|
| + scoped_ptr<FormField> form_field(parse(&scanner));
|
| if (!form_field.get()) {
|
| remaining_fields.push_back(scanner.Cursor());
|
| scanner.Advance();
|
|
|