[Autofill] Move FieldTypeGroup out of the AutofillType class.

components/autofill/core/browser/field_types.h

Index: components/autofill/core/browser/field_types.h
diff --git a/components/autofill/core/browser/field_types.h b/components/autofill/core/browser/field_types.h
index 3fab90e40e0803a7dcf02f17442f7bd9f6d74003..1e784d566f412e5f72676df821b0cc0292124b0e 100644
--- a/components/autofill/core/browser/field_types.h
+++ b/components/autofill/core/browser/field_types.h
@@ -5,8 +5,10 @@
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_FIELD_TYPES_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_FIELD_TYPES_H_
 
+#include <map>
 #include <set>
-#include <string>
+
+#include "base/strings/string16.h"
 
 namespace autofill {
 
@@ -102,7 +104,21 @@ enum AutofillFieldType {
   MAX_VALID_FIELD_TYPE = 73,
 };
 
+enum FieldTypeGroup {
+  NO_GROUP,
+  NAME,
+  NAME_BILLING,
+  EMAIL,
+  COMPANY,
+  ADDRESS_HOME,
+  ADDRESS_BILLING,
+  PHONE_HOME,
+  PHONE_BILLING,
+  CREDIT_CARD,
+};
+
 typedef std::set<AutofillFieldType> FieldTypeSet;
+typedef std::map<base::string16, AutofillFieldType> FieldTypeMap;
 
 }  // namespace autofill