Autofill refactor form_field.h/cc.

chrome/browser/autofill/address_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_ADDRESS_FIELD_H_
 #define CHROME_BROWSER_AUTOFILL_ADDRESS_FIELD_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/form_field.h"
 
 class AutofillField;
 class AutofillScanner;
 
 class AddressField : public FormField {
  public:
-  virtual bool GetFieldInfo(FieldTypeMap* field_type_map) const OVERRIDE;
-
   static AddressField* Parse(AutofillScanner* scanner, bool is_ecml);
 
   // Tries to determine the billing/shipping type of this address.
   AddressType FindType() const;
 
   // Returns true if this is a full address as opposed to an address fragment
   // such as a stand-alone ZIP code.
   bool IsFullAddress();

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

This is used only in the unit tests -- should we perhaps get rid of it?

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

Done.  Yes, this wasn't providing any meaningful coverage in the tests either. 
So I've removed it.

 
  private:
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseOneLineAddress);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseOneLineAddressBilling);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseOneLineAddressShipping);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseOneLineAddressEcml);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseTwoLineAddress);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseThreeLineAddress);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseTwoLineAddressEcml);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseCity);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseCityEcml);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseState);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseStateEcml);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseZip);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseZipEcml);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseStateAndZipOneLabel);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseCountry);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseCountryEcml);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseTwoLineAddressMissingLabel);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseCompany);
+  FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseCompanyEcml);
+
   AddressField();
 
+  // FormField:
+  virtual bool ClassifyField(FieldTypeMap* map) const OVERRIDE;
+
   static bool ParseCompany(AutofillScanner* scanner,
                            bool is_ecml,
                            AddressField* address_field);
   static bool ParseAddressLines(AutofillScanner* scanner,
                                 bool is_ecml,
                                 AddressField* address_field);
   static bool ParseCountry(AutofillScanner* scanner,
                            bool is_ecml,
                            AddressField* address_field);
   static bool ParseZipCode(AutofillScanner* scanner,
@@ skipping 18 matching lines @@
   const AutofillField* zip_;
   const AutofillField* zip4_;      // optional ZIP+4; we don't fill this yet
   const AutofillField* country_;   // optional
 
   AddressType type_;
 
   DISALLOW_COPY_AND_ASSIGN(AddressField);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_ADDRESS_FIELD_H_