Autofill refactor form_field.h/cc.

chrome/browser/autofill/phone_field.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_PHONE_FIELD_H_
 #define CHROME_BROWSER_AUTOFILL_PHONE_FIELD_H_
 #pragma once
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/form_field.h"
 #include "chrome/browser/autofill/phone_number.h"
 
 class AutofillField;
 class AutofillScanner;
 
 // A phone number in one of the following formats:
 // - area code, prefix, suffix
 // - area code, number
 // - number
 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);
 
+ protected:
+  // FormField:
+  virtual bool ClassifyField(FieldTypeMap* map) const OVERRIDE;
+
  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();
 
   enum PhoneType {
     PHONE_TYPE_FIRST = 0,
     HOME_PHONE = PHONE_TYPE_FIRST,
     FAX_PHONE,
 
     // Must be last.
     PHONE_TYPE_MAX,
   };
@@ skipping 69 matching lines @@
   static struct Parser {
     RegexType regex;       // Field matching reg-ex.
     PhonePart phone_part;  // Index of the field.
     int max_size;          // Max size of the field to match. 0 means any.
   } phone_field_grammars_[];
 
   DISALLOW_COPY_AND_ASSIGN(PhoneField);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_PHONE_FIELD_H_