Eliminate static initialization in autofill_type.cc

chrome/browser/autofill/autofill_type.cc

 // 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.
 
 #include "chrome/browser/autofill/autofill_type.h"
 
 #include <ostream>
 
 #include "base/logging.h"
 
 namespace {
 
-const AutofillType::AutofillTypeDefinition kUnknownAutofillTypeDefinition = {
-  /* UNKNOWN_TYPE */ AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP
-};
-
 AutofillType::AutofillTypeDefinition kAutofillTypeDefinitions[] = {
   // NO_SERVER_DATA
   { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
   // UNKNOWN_TYPE
-  kUnknownAutofillTypeDefinition,
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
   // EMPTY_TYPE
   { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
 
   // NAME_FIRST
   { AutofillType::NAME, AutofillType::NO_SUBGROUP },
   // NAME_MIDDLE
   { AutofillType::NAME, AutofillType::NO_SUBGROUP },
   // NAME_LAST
   { AutofillType::NAME, AutofillType::NO_SUBGROUP },
   // NAME_MIDDLE_INITIAL
@@ skipping 11 matching lines @@
   // PHONE_HOME_CITY_CODE
   { AutofillType::PHONE_HOME, AutofillType::PHONE_CITY_CODE },
   // PHONE_HOME_COUNTRY_CODE
   { AutofillType::PHONE_HOME, AutofillType::PHONE_COUNTRY_CODE },
   // PHONE_HOME_CITY_AND_NUMBER
   { AutofillType::PHONE_HOME, AutofillType::PHONE_CITY_AND_NUMBER },
   // PHONE_HOME_WHOLE_NUMBER
   { AutofillType::PHONE_HOME, AutofillType::PHONE_WHOLE_NUMBER },
 
   // Work phone numbers (values [15,19]) are deprecated.
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
 
   // PHONE_FAX_NUMBER
   { AutofillType::PHONE_FAX, AutofillType::PHONE_NUMBER },
   // PHONE_FAX_CITY_CODE
   { AutofillType::PHONE_FAX, AutofillType::PHONE_CITY_CODE },
   // PHONE_FAX_COUNTRY_CODE
   { AutofillType::PHONE_FAX, AutofillType::PHONE_COUNTRY_CODE },
   // PHONE_FAX_CITY_AND_NUMBER
   { AutofillType::PHONE_FAX, AutofillType::PHONE_CITY_AND_NUMBER },
   // PHONE_FAX_WHOLE_NUMBER
   { AutofillType::PHONE_FAX, AutofillType::PHONE_WHOLE_NUMBER },
 
   // Cell phone numbers (values [25, 29]) are deprecated.
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
 
   // ADDRESS_HOME_LINE1
   { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_LINE1 },
   // ADDRESS_HOME_LINE2
   { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_LINE2 },
   // ADDRESS_HOME_APT_NUM
   { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_APT_NUM },
   // ADDRESS_HOME_CITY
   { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_CITY },
   // ADDRESS_HOME_STATE
@@ skipping 12 matching lines @@
   // ADDRESS_BILLING_CITY
   { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_CITY },
   // ADDRESS_BILLING_STATE
   { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_STATE },
   // ADDRESS_BILLING_ZIP
   { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_ZIP },
   // ADDRESS_BILLING_COUNTRY
   { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_COUNTRY },
 
   // ADDRESS_SHIPPING values [44,50] are deprecated.
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
-  kUnknownAutofillTypeDefinition,
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
+  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
 
   // CREDIT_CARD_NAME
   { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
   // CREDIT_CARD_NUMBER
   { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
   // CREDIT_CARD_EXP_MONTH
   { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
   // CREDIT_CARD_EXP_2_DIGIT_YEAR
   { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
   // CREDIT_CARD_EXP_4_DIGIT_YEAR
@@ skipping 261 matching lines @@
   if (str == "CREDIT_CARD_TYPE")
     return CREDIT_CARD_TYPE;
   if (str == "CREDIT_CARD_VERIFICATION_CODE")
     return CREDIT_CARD_VERIFICATION_CODE;
   if (str == "COMPANY_NAME")
     return COMPANY_NAME;
 
   NOTREACHED() << "Unknown AutofillFieldType " << str;
   return UNKNOWN_TYPE;
 }