[Autofill] Move FieldTypeGroup out of the AutofillType class.

components/autofill/core/browser/autofill_type_unittest.cc

Index: components/autofill/core/browser/autofill_type_unittest.cc
diff --git a/components/autofill/core/browser/autofill_type_unittest.cc b/components/autofill/core/browser/autofill_type_unittest.cc
index eb68e0151afa6f04e527b26b500e0b4e7993cd30..8bff67162bd624a2ec78b9294c7ea96119869fa2 100644
--- a/components/autofill/core/browser/autofill_type_unittest.cc
+++ b/components/autofill/core/browser/autofill_type_unittest.cc
@@ -12,42 +12,42 @@ TEST(AutofillTypeTest, AutofillTypes) {
   // No server data.
   AutofillType none(NO_SERVER_DATA);
   EXPECT_EQ(NO_SERVER_DATA, none.field_type());
-  EXPECT_EQ(AutofillType::NO_GROUP, none.group());
+  EXPECT_EQ(NO_GROUP, none.group());
 
   // Unknown type.
   AutofillType unknown(UNKNOWN_TYPE);
   EXPECT_EQ(UNKNOWN_TYPE, unknown.field_type());
-  EXPECT_EQ(AutofillType::NO_GROUP, unknown.group());
+  EXPECT_EQ(NO_GROUP, unknown.group());
 
   // Type with group but no subgroup.
   AutofillType first(NAME_FIRST);
   EXPECT_EQ(NAME_FIRST, first.field_type());
-  EXPECT_EQ(AutofillType::NAME, first.group());
+  EXPECT_EQ(NAME, first.group());
 
   // Type with group and subgroup.
   AutofillType phone(PHONE_HOME_NUMBER);
   EXPECT_EQ(PHONE_HOME_NUMBER, phone.field_type());
-  EXPECT_EQ(AutofillType::PHONE_HOME, phone.group());
+  EXPECT_EQ(PHONE_HOME, phone.group());
 
   // Last value, to check any offset errors.
   AutofillType last(COMPANY_NAME);
   EXPECT_EQ(COMPANY_NAME, last.field_type());
-  EXPECT_EQ(AutofillType::COMPANY, last.group());
+  EXPECT_EQ(COMPANY, last.group());
 
   // Boundary (error) condition.
   AutofillType boundary(MAX_VALID_FIELD_TYPE);
   EXPECT_EQ(UNKNOWN_TYPE, boundary.field_type());
-  EXPECT_EQ(AutofillType::NO_GROUP, boundary.group());
+  EXPECT_EQ(NO_GROUP, boundary.group());
 
   // Beyond the boundary (error) condition.
   AutofillType beyond(static_cast<AutofillFieldType>(MAX_VALID_FIELD_TYPE+10));
   EXPECT_EQ(UNKNOWN_TYPE, beyond.field_type());
-  EXPECT_EQ(AutofillType::NO_GROUP, beyond.group());
+  EXPECT_EQ(NO_GROUP, beyond.group());
 
   // In-between value.  Missing from enum but within range.  Error condition.
   AutofillType between(static_cast<AutofillFieldType>(16));
   EXPECT_EQ(UNKNOWN_TYPE, between.field_type());
-  EXPECT_EQ(AutofillType::NO_GROUP, between.group());
+  EXPECT_EQ(NO_GROUP, between.group());
 }
 
 }  // namespace