Remove static initializers in autofill_country.cc.

chrome/browser/autofill/autofill_country.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_country.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <map>
 #include <utility>
@@ skipping 11 matching lines @@
 #include "unicode/locid.h"
 #include "unicode/ucol.h"
 #include "unicode/uloc.h"
 #include "unicode/unistr.h"
 #include "unicode/urename.h"
 #include "unicode/utypes.h"
 
 namespace {
 
 struct CountryData {
-  std::string country_code;
   int postal_code_label_id;
   int state_label_id;
 };
 
 // The maximum capacity needed to store a locale up to the country code.
 const size_t kLocaleCapacity =
     ULOC_LANG_CAPACITY + ULOC_SCRIPT_CAPACITY + ULOC_COUNTRY_CAPACITY + 1;
 
+struct StaticCountryData {
+  char country_code[3];
+  int postal_code_label_id;

[Peter Kasting, 2011/08/30 22:55:52]

Nit: If we nested the structs:

struct CountryDataInitializer {
  char country_code[3];
  CountryData country_data;
};

...then in addition to not repeating the members, we'd save having to construct
a temporary CountryData struct in the loop in the constructor.

[tony, 2011/08/30 23:11:28]

Good idea!  Done.

+  int state_label_id;
+};
+
 // Maps country codes to localized label string identifiers.
-const CountryData kCountryData[] = {
+const StaticCountryData kCountryData[] = {
   {"AD", IDS_AUTOFILL_DIALOG_POSTAL_CODE, IDS_AUTOFILL_DIALOG_PARISH},
   {"AE", IDS_AUTOFILL_DIALOG_POSTAL_CODE, IDS_AUTOFILL_DIALOG_EMIRATE},
   {"AF", IDS_AUTOFILL_DIALOG_POSTAL_CODE, IDS_AUTOFILL_DIALOG_PROVINCE},
   {"AG", IDS_AUTOFILL_DIALOG_POSTAL_CODE, IDS_AUTOFILL_DIALOG_PROVINCE},
   {"AI", IDS_AUTOFILL_DIALOG_POSTAL_CODE, IDS_AUTOFILL_DIALOG_PROVINCE},
   {"AL", IDS_AUTOFILL_DIALOG_POSTAL_CODE, IDS_AUTOFILL_DIALOG_PROVINCE},
   {"AM", IDS_AUTOFILL_DIALOG_POSTAL_CODE, IDS_AUTOFILL_DIALOG_PROVINCE},
   {"AN", IDS_AUTOFILL_DIALOG_POSTAL_CODE, IDS_AUTOFILL_DIALOG_PROVINCE},
   {"AO", IDS_AUTOFILL_DIALOG_POSTAL_CODE, IDS_AUTOFILL_DIALOG_PROVINCE},
   {"AQ", IDS_AUTOFILL_DIALOG_POSTAL_CODE, IDS_AUTOFILL_DIALOG_PROVINCE},
@@ skipping 251 matching lines @@
 };
 
 // static
 CountryDataMap* CountryDataMap::GetInstance() {
   return Singleton<CountryDataMap>::get();
 }
 
 CountryDataMap::CountryDataMap() {
   // Add all the countries we have explicit data for.
   for (size_t i = 0; i < arraysize(kCountryData); ++i) {
-    const CountryData& data = kCountryData[i];
-    country_data_.insert(std::make_pair(data.country_code, data));
+    const StaticCountryData& static_data = kCountryData[i];
+    CountryData data = {
+        static_data.postal_code_label_id,
+        static_data.state_label_id
+    };
+    country_data_.insert(std::make_pair(static_data.country_code, data));
   }
 
   // Add any other countries that ICU knows about, falling back to default data
   // values.
   for (const char* const* country_pointer = icu::Locale::getISOCountries();
        *country_pointer;
        ++country_pointer) {
     std::string country_code = *country_pointer;
     if (!country_data_.count(country_code)) {
       CountryData data = {
-        country_code,
         IDS_AUTOFILL_DIALOG_POSTAL_CODE,
         IDS_AUTOFILL_DIALOG_PROVINCE
       };
       country_data_.insert(std::make_pair(country_code, data));
     }
   }
 }
 
 const CountryDataMap::Iterator CountryDataMap::Begin() {
   return GetInstance()->country_data_.begin();
@@ skipping 71 matching lines @@
   return Singleton<CountryNames>::get();
 }
 
 CountryNames::CountryNames() {
   // Add 2- and 3-letter ISO country codes.
   for (CountryDataMap::Iterator it = CountryDataMap::Begin();
        it != CountryDataMap::End();
        ++it) {
     const std::string& country_code = it->first;
     std::string iso3_country_code =
-    icu::Locale(NULL, country_code.c_str()).getISO3Country();
+        icu::Locale(NULL, country_code.c_str()).getISO3Country();
 
     common_names_.insert(std::make_pair(country_code, country_code));
     common_names_.insert(std::make_pair(iso3_country_code, country_code));
   }
 
   // Add a few other common synonyms.
   common_names_.insert(std::make_pair("UNITED STATES OF AMERICA", "US"));
   common_names_.insert(std::make_pair("GREAT BRITAIN", "GB"));
   common_names_.insert(std::make_pair("UK", "GB"));
   common_names_.insert(std::make_pair("BRASIL", "BR"));
@@ skipping 199 matching lines @@
 
 AutofillCountry::AutofillCountry(const std::string& country_code,
                                  const string16& name,
                                  const string16& postal_code_label,
                                  const string16& state_label)
     : country_code_(country_code),
       name_(name),
       postal_code_label_(postal_code_label),
       state_label_(state_label) {
 }