Autofill refactor form_field.h/cc.

chrome/browser/autofill/name_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_NAME_FIELD_H_
 #define CHROME_BROWSER_AUTOFILL_NAME_FIELD_H_
 #pragma once
 
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/form_field.h"
 
 class AutofillScanner;
 
 // A form field that can parse either a FullNameField or a FirstLastNameField.
 class NameField : public FormField {
  public:
   static NameField* Parse(AutofillScanner* scanner, bool is_ecml);
 
  protected:
   NameField() {}
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(NameFieldTest, FirstMiddleLast);
+  FRIEND_TEST_ALL_PREFIXES(NameFieldTest, FirstMiddleLast2);
+  FRIEND_TEST_ALL_PREFIXES(NameFieldTest, FirstLast);
+  FRIEND_TEST_ALL_PREFIXES(NameFieldTest, FirstLast2);
+  FRIEND_TEST_ALL_PREFIXES(NameFieldTest, FirstLastMiddleWithSpaces);
+  FRIEND_TEST_ALL_PREFIXES(NameFieldTest, FirstLastEmpty);
+  FRIEND_TEST_ALL_PREFIXES(NameFieldTest, FirstMiddleLastEmpty);
+  FRIEND_TEST_ALL_PREFIXES(NameFieldTest, MiddleInitial);
+  FRIEND_TEST_ALL_PREFIXES(NameFieldTest, MiddleInitialAtEnd);
+  FRIEND_TEST_ALL_PREFIXES(NameFieldTest, ECMLFirstMiddleLast);
+
+  // FormField:
+  virtual bool ClassifyField(FieldTypeMap* map) const OVERRIDE { return false; }
+
   DISALLOW_COPY_AND_ASSIGN(NameField);
 };
 
 // A form field that can parse a full name field.
 class FullNameField : public NameField {

[Ilya Sherman, 2011/05/19 05:44:16]

Should this class and also FirstLastNameField be moved into an anonymous
namespace in the implementation file?

[dhollowa, 2011/05/19 17:53:08]

Yes.  Done.

  public:
-  virtual bool GetFieldInfo(FieldTypeMap* field_type_map) const OVERRIDE;
-
   static FullNameField* Parse(AutofillScanner* scanner);
 
  private:
   explicit FullNameField(const AutofillField* field);
 
+  // FormField interface:
+  virtual bool ClassifyField(FieldTypeMap* field_type_map) const OVERRIDE;
+
   const AutofillField* field_;
   DISALLOW_COPY_AND_ASSIGN(FullNameField);
 };
 
 // A form field that can parse a first and last name field.
 class FirstLastNameField : public NameField {
  public:
-  virtual bool GetFieldInfo(FieldTypeMap* field_type_map) const OVERRIDE;
-
   static FirstLastNameField* ParseSpecificName(AutofillScanner* scanner);
   static FirstLastNameField* ParseComponentNames(AutofillScanner* scanner);
   static FirstLastNameField* ParseEcmlName(AutofillScanner* scanner);
   static FirstLastNameField* Parse(AutofillScanner* scanner, bool is_ecml);
 
  private:
   FirstLastNameField();
 
+  // FormField interface:
+  virtual bool ClassifyField(FieldTypeMap* field_type_map) const OVERRIDE;
+
   const AutofillField* first_name_;
   const AutofillField* middle_name_;  // Optional.
   const AutofillField* last_name_;
   bool middle_initial_;  // True if middle_name_ is a middle initial.
 
   DISALLOW_COPY_AND_ASSIGN(FirstLastNameField);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_NAME_FIELD_H_