Refactor autofill form fields.

chrome/browser/autofill/name_field.cc

Index: chrome/browser/autofill/name_field.cc
diff --git a/chrome/browser/autofill/name_field.cc b/chrome/browser/autofill/name_field.cc
index 87f98cea3989bcb78d520fd30380fe716747f721..7943001d534383af8cb9a850a71291ac1a7db09e 100644
--- a/chrome/browser/autofill/name_field.cc
+++ b/chrome/browser/autofill/name_field.cc
@@ -39,6 +39,7 @@ FullNameField* FullNameField::Parse(AutofillScanner* scanner) {
   // for example, Travelocity_Edit travel profile.html contains a field
   // "Travel Profile Name".
   if (ParseText(scanner, l10n_util::GetStringUTF16(IDS_AUTOFILL_NAME_RE),
+                MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
                 &field))
     return new FullNameField(field);
 
@@ -67,6 +68,7 @@ FirstLastNameField* FirstLastNameField::ParseSpecificName(
   const AutofillField* next;
   if (ParseText(scanner,
                 l10n_util::GetStringUTF16(IDS_AUTOFILL_NAME_SPECIFIC_RE),
+                MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
                 &v->first_name_) &&
       ParseEmptyText(scanner, &next)) {
     if (ParseEmptyText(scanner, &v->last_name_)) {
@@ -99,7 +101,7 @@ FirstLastNameField* FirstLastNameField::ParseComponentNames(
   // American-style).
   // The ".*first$" matches fields ending in "first" (example in sample8.html).
   if (!ParseText(scanner, l10n_util::GetStringUTF16(IDS_AUTOFILL_FIRST_NAME_RE),
-                 &v->first_name_))
+                 MATCH_NAME | MATCH_LABEL | MATCH_TEXT, &v->first_name_))
     return NULL;
 
   // We check for a middle initial before checking for a middle name
@@ -109,16 +111,17 @@ FirstLastNameField* FirstLastNameField::ParseComponentNames(
   // middle initial.
   if (ParseText(scanner,
                 l10n_util::GetStringUTF16(IDS_AUTOFILL_MIDDLE_INITIAL_RE),
+                MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
                 &v->middle_name_)) {
     v->middle_initial_ = true;
   } else {
     ParseText(scanner, l10n_util::GetStringUTF16(IDS_AUTOFILL_MIDDLE_NAME_RE),
-              &v->middle_name_);
+              MATCH_NAME | MATCH_LABEL | MATCH_TEXT, &v->middle_name_);
   }
 
   // The ".*last$" matches fields ending in "last" (example in sample8.html).
   if (ParseText(scanner, l10n_util::GetStringUTF16(IDS_AUTOFILL_LAST_NAME_RE),
-                &v->last_name_)) {
+                MATCH_NAME | MATCH_LABEL | MATCH_TEXT, &v->last_name_)) {
     return v.release();
   }
 
@@ -133,14 +136,17 @@ FirstLastNameField* FirstLastNameField::ParseEcmlName(
 
   string16 pattern = GetEcmlPattern(kEcmlShipToFirstName,
                                     kEcmlBillToFirstName, '|');
-  if (!ParseText(scanner, pattern, &field->first_name_))
+  if (!ParseText(scanner, pattern, MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
+                 &field->first_name_))
     return NULL;
 
   pattern = GetEcmlPattern(kEcmlShipToMiddleName, kEcmlBillToMiddleName, '|');
-  ParseText(scanner, pattern, &field->middle_name_);
+  ParseText(scanner, pattern, MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
+            &field->middle_name_);
 
   pattern = GetEcmlPattern(kEcmlShipToLastName, kEcmlBillToLastName, '|');
-  if (ParseText(scanner, pattern, &field->last_name_))
+  if (ParseText(scanner, pattern, MATCH_NAME | MATCH_LABEL | MATCH_TEXT,
+                &field->last_name_))
     return field.release();
 
   scanner->Rewind();