[Autofill] Move FieldTypeGroup out of the AutofillType class.

components/autofill/core/browser/autofill_type.h

Index: components/autofill/core/browser/autofill_type.h
diff --git a/components/autofill/core/browser/autofill_type.h b/components/autofill/core/browser/autofill_type.h
index c626dc094b630ff32b935c661c6116ab709b89c2..c85bea1589c9a3ca26b7db2cd895095af8950990 100644
--- a/components/autofill/core/browser/autofill_type.h
+++ b/components/autofill/core/browser/autofill_type.h
@@ -5,11 +5,8 @@
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_TYPE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_TYPE_H_
 
-#include <map>
-#include <set>
 #include <string>
 
-#include "base/strings/string16.h"
 #include "components/autofill/core/browser/field_types.h"
 
 namespace autofill {
@@ -18,19 +15,6 @@ namespace autofill {
 // and for associating form fields with form values in the Web Database.
 class AutofillType {
  public:
-  enum FieldTypeGroup {
-    NO_GROUP,
-    NAME,
-    NAME_BILLING,
-    EMAIL,
-    COMPANY,
-    ADDRESS_HOME,
-    ADDRESS_BILLING,
-    PHONE_HOME,
-    PHONE_BILLING,
-    CREDIT_CARD,
-  };
-
   explicit AutofillType(AutofillFieldType field_type);
   AutofillType(const AutofillType& autofill_type);
   AutofillType& operator=(const AutofillType& autofill_type);
@@ -56,10 +40,6 @@ class AutofillType {
   AutofillFieldType field_type_;
 };
 
-typedef AutofillType::FieldTypeGroup FieldTypeGroup;
-typedef std::set<AutofillFieldType> FieldTypeSet;
-typedef std::map<base::string16, AutofillFieldType> FieldTypeMap;
-
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_TYPE_H_