| Index: chrome/browser/autofill/phone_field.cc
|
| diff --git a/chrome/browser/autofill/phone_field.cc b/chrome/browser/autofill/phone_field.cc
|
| index f310073a18df4cf466db5edf1cd8c24d63559a05..8a1839d11c8dee78efc7ba3e46b5a502618542fe 100644
|
| --- a/chrome/browser/autofill/phone_field.cc
|
| +++ b/chrome/browser/autofill/phone_field.cc
|
| @@ -9,7 +9,6 @@
|
| #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/fax_number.h"
|
| @@ -17,8 +16,6 @@
|
| #include "grit/autofill_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| -using autofill::GetEcmlPattern;
|
| -
|
| // Phone field grammars - first matched grammar will be parsed. Grammars are
|
| // separated by { REGEX_SEPARATOR, FIELD_NONE, 0 }. Suffix and extension are
|
| // parsed separately unless they are necessary parts of the match.
|
| @@ -110,13 +107,10 @@ PhoneField::Parser PhoneField::phone_field_grammars_[] = {
|
| PhoneField::~PhoneField() {}
|
|
|
| // static
|
| -FormField* PhoneField::Parse(AutofillScanner* scanner, bool is_ecml) {
|
| +FormField* PhoneField::Parse(AutofillScanner* scanner) {
|
| if (scanner->IsEnd())
|
| return NULL;
|
|
|
| - if (is_ecml)
|
| - return ParseECML(scanner);
|
| -
|
| scoped_ptr<PhoneField> phone_field(new PhoneField);
|
|
|
| // Go through the phones in order HOME, FAX, attempting to match. HOME should
|
| @@ -131,20 +125,6 @@ FormField* PhoneField::Parse(AutofillScanner* scanner, bool is_ecml) {
|
| return NULL;
|
| }
|
|
|
| -// static
|
| -FormField* PhoneField::ParseECML(AutofillScanner* scanner) {
|
| - string16 pattern(GetEcmlPattern(kEcmlShipToPhone, kEcmlBillToPhone, '|'));
|
| -
|
| - const AutofillField* field;
|
| - if (ParseField(scanner, pattern, &field)) {
|
| - PhoneField* phone_field = new PhoneField();
|
| - phone_field->parsed_phone_fields_[FIELD_PHONE] = field;
|
| - return phone_field;
|
| - }
|
| -
|
| - return NULL;
|
| -}
|
| -
|
| PhoneField::PhoneField() {
|
| memset(parsed_phone_fields_, 0, sizeof(parsed_phone_fields_));
|
| SetPhoneType(HOME_PHONE);
|
|
|