Autofill refactor form_field.h/cc.

chrome/browser/autofill/phone_field.h

Index: chrome/browser/autofill/phone_field.h
diff --git a/chrome/browser/autofill/phone_field.h b/chrome/browser/autofill/phone_field.h
index de1181f125d531bca0595e401cacc7d4d061a8e5..3516193b5af3f81cef3c20275ef0d1baadd11a26 100644
--- a/chrome/browser/autofill/phone_field.h
+++ b/chrome/browser/autofill/phone_field.h
@@ -25,14 +25,26 @@ class PhoneField : public FormField {
  public:
   virtual ~PhoneField();
 
-  virtual bool GetFieldInfo(FieldTypeMap* field_type_map) const OVERRIDE;
-
   static PhoneField* Parse(AutofillScanner* scanner, bool is_ecml);
   static PhoneField* ParseECML(AutofillScanner* scanner);
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseOneLinePhone);
+  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseOneLinePhoneEcml);
+  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseTwoLinePhone);
+  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseTwoLinePhoneEcmlShipTo);
+  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseTwoLinePhoneEcmlBillTo);
+  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ThreePartPhoneNumber);
+  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ThreePartPhoneNumberPrefixSuffix);
+  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseOneLineFax);
+  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseTwoLineFax);
+  FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ThreePartFaxNumberPrefixSuffix);
+
   PhoneField();
 
+  // FormField:
+  virtual bool ClassifyField(FieldTypeMap* map) const OVERRIDE;
+
   enum PhoneType {
     PHONE_TYPE_FIRST = 0,
     HOME_PHONE = PHONE_TYPE_FIRST,