CrOs: Remove 29 exit time destructors and 8 static initializers.

chrome/browser/chromeos/cros/onc_network_parser.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/chromeos/cros/onc_network_parser.h"
 
 #include "base/base64.h"
 #include "base/json/json_value_serializer.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
@@ skipping 28 matching lines @@
     { "ServerCARef", PROPERTY_INDEX_EAP_CA_CERT },
     { "ClientCARef", PROPERTY_INDEX_EAP_CLIENT_CERT },
     { "ClientCertPattern", PROPERTY_INDEX_EAP_CLIENT_CERT_PATTERN },
     { "Identity", PROPERTY_INDEX_EAP_IDENTITY },
     { "Password", PROPERTY_INDEX_EAP_PASSWORD },
     { "AnonymousIdentity", PROPERTY_INDEX_EAP_ANONYMOUS_IDENTITY },
 };
 
 // Serve the singleton mapper instance.
 const EnumMapper<PropertyIndex>* get_onc_mapper() {
-  static const EnumMapper<PropertyIndex> mapper(property_index_table,
-                                                arraysize(property_index_table),
-                                                PROPERTY_INDEX_UNKNOWN);
+  CR_DEFINE_STATIC_LOCAL(const EnumMapper<PropertyIndex>, mapper,
+      (property_index_table,
+       arraysize(property_index_table),
+       PROPERTY_INDEX_UNKNOWN));
   return &mapper;
 }
 
 ConnectionType ParseNetworkType(const std::string& type) {
   static EnumMapper<ConnectionType>::Pair table[] = {
     { "WiFi", TYPE_WIFI },
     { "VPN", TYPE_VPN },
   };
-  static EnumMapper<ConnectionType> parser(
-      table, arraysize(table), TYPE_UNKNOWN);
+  CR_DEFINE_STATIC_LOCAL(EnumMapper<ConnectionType>, parser,
+      (table, arraysize(table), TYPE_UNKNOWN));
   return parser.Get(type);
 }
 
 }  // namespace
 
 // -------------------- OncNetworkParser --------------------
 
 OncNetworkParser::OncNetworkParser(const std::string& onc_blob)
     : NetworkParser(get_onc_mapper()),
       network_configs_(NULL),
@@ skipping 390 matching lines @@
 }
 
 ConnectionSecurity OncWifiNetworkParser::ParseSecurity(
     const std::string& security) {
   static EnumMapper<ConnectionSecurity>::Pair table[] = {
     { "None", SECURITY_NONE },
     { "WEP", SECURITY_WEP },
     { "WPA", SECURITY_WPA },
     { "WPA2", SECURITY_8021X },
   };
-  static EnumMapper<ConnectionSecurity> parser(
-      table, arraysize(table), SECURITY_UNKNOWN);
+  CR_DEFINE_STATIC_LOCAL(EnumMapper<ConnectionSecurity>, parser,
+      (table, arraysize(table), SECURITY_UNKNOWN));
   return parser.Get(security);
 }
 
 EAPMethod OncWifiNetworkParser::ParseEAPMethod(const std::string& method) {
   static EnumMapper<EAPMethod>::Pair table[] = {
     { "PEAP", EAP_METHOD_PEAP },
     { "EAP-TLS", EAP_METHOD_TLS },
     { "EAP-TTLS", EAP_METHOD_TTLS },
     { "LEAP", EAP_METHOD_LEAP },
   };
-  static EnumMapper<EAPMethod> parser(
-      table, arraysize(table), EAP_METHOD_UNKNOWN);
+  CR_DEFINE_STATIC_LOCAL(EnumMapper<EAPMethod>, parser,
+      (table, arraysize(table), EAP_METHOD_UNKNOWN));
   return parser.Get(method);
 }
 
 EAPPhase2Auth OncWifiNetworkParser::ParseEAPPhase2Auth(
     const std::string& auth) {
   static EnumMapper<EAPPhase2Auth>::Pair table[] = {
     { "MD5", EAP_PHASE_2_AUTH_MD5 },
     { "MSCHAPV2", EAP_PHASE_2_AUTH_MSCHAPV2 },
     { "MSCHAP", EAP_PHASE_2_AUTH_MSCHAP },
     { "PAP", EAP_PHASE_2_AUTH_PAP },
   };
-  static EnumMapper<EAPPhase2Auth> parser(
-      table, arraysize(table), EAP_PHASE_2_AUTH_AUTO);
+  CR_DEFINE_STATIC_LOCAL(EnumMapper<EAPPhase2Auth>, parser,
+      (table, arraysize(table), EAP_PHASE_2_AUTH_AUTO));
   return parser.Get(auth);
 }
 
 // -------------------- OncVirtualNetworkParser --------------------
 
 
 OncVirtualNetworkParser::OncVirtualNetworkParser() {}
 OncVirtualNetworkParser::~OncVirtualNetworkParser() {}
 
 bool OncVirtualNetworkParser::UpdateNetworkFromInfo(
@@ skipping 117 matching lines @@
   }
   return false;
 }
 
 ProviderType OncVirtualNetworkParser::ParseProviderType(
     const std::string& type) {
   static EnumMapper<ProviderType>::Pair table[] = {
     { flimflam::kProviderL2tpIpsec, PROVIDER_TYPE_L2TP_IPSEC_PSK },
     { flimflam::kProviderOpenVpn, PROVIDER_TYPE_OPEN_VPN },
   };
-  static EnumMapper<ProviderType> parser(
-      table, arraysize(table), PROVIDER_TYPE_MAX);
+  CR_DEFINE_STATIC_LOCAL(EnumMapper<ProviderType>, parser,
+      (table, arraysize(table), PROVIDER_TYPE_MAX));
   return parser.Get(type);
 }
 
 }  // namespace chromeos