Revert 113120 - this CL broke then chromeos clang bot:

chrome/browser/chromeos/cros/native_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/native_network_parser.h"
 
 #include <string>
 
 #include "base/stringprintf.h"
 #include "base/string_util.h"
@@ skipping 58 matching lines @@
   { flimflam::kFirmwareRevisionProperty, PROPERTY_INDEX_FIRMWARE_REVISION },
   { flimflam::kFoundNetworksProperty, PROPERTY_INDEX_FOUND_NETWORKS },
   { flimflam::kGuidProperty, PROPERTY_INDEX_GUID },
   { flimflam::kHardwareRevisionProperty, PROPERTY_INDEX_HARDWARE_REVISION },
   { flimflam::kHomeProviderProperty, PROPERTY_INDEX_HOME_PROVIDER },
   { flimflam::kHostProperty, PROPERTY_INDEX_HOST },
   { flimflam::kIdentityProperty, PROPERTY_INDEX_IDENTITY },
   { flimflam::kImeiProperty, PROPERTY_INDEX_IMEI },
   { flimflam::kImsiProperty, PROPERTY_INDEX_IMSI },
   { flimflam::kIsActiveProperty, PROPERTY_INDEX_IS_ACTIVE },
-  { flimflam::kL2tpIpsecAuthenticationType,
-    PROPERTY_INDEX_IPSEC_AUTHENTICATIONTYPE },
   { flimflam::kL2tpIpsecCaCertNssProperty,
     PROPERTY_INDEX_L2TPIPSEC_CA_CERT_NSS },
   { flimflam::kL2tpIpsecClientCertIdProperty,
     PROPERTY_INDEX_L2TPIPSEC_CLIENT_CERT_ID },
   { flimflam::kL2tpIpsecClientCertSlotProp,
     PROPERTY_INDEX_L2TPIPSEC_CLIENT_CERT_SLOT },
-  { flimflam::kL2tpIpsecIkeVersion, PROPERTY_INDEX_IPSEC_IKEVERSION },
   { flimflam::kL2tpIpsecPinProperty, PROPERTY_INDEX_L2TPIPSEC_PIN },
   { flimflam::kL2tpIpsecPskProperty, PROPERTY_INDEX_L2TPIPSEC_PSK },
   { flimflam::kL2tpIpsecPasswordProperty, PROPERTY_INDEX_L2TPIPSEC_PASSWORD },
   { flimflam::kL2tpIpsecUserProperty, PROPERTY_INDEX_L2TPIPSEC_USER },
   { flimflam::kL2tpIpsecGroupNameProperty,
     PROPERTY_INDEX_L2TPIPSEC_GROUP_NAME },
   { flimflam::kManufacturerProperty, PROPERTY_INDEX_MANUFACTURER },
   { flimflam::kMdnProperty, PROPERTY_INDEX_MDN },
   { flimflam::kMeidProperty, PROPERTY_INDEX_MEID },
   { flimflam::kMinProperty, PROPERTY_INDEX_MIN },
   { flimflam::kModeProperty, PROPERTY_INDEX_MODE },
   { flimflam::kModelIDProperty, PROPERTY_INDEX_MODEL_ID },
   { flimflam::kNameProperty, PROPERTY_INDEX_NAME },
   { flimflam::kNetworkTechnologyProperty, PROPERTY_INDEX_NETWORK_TECHNOLOGY },
   { flimflam::kNetworksProperty, PROPERTY_INDEX_NETWORKS },
   { flimflam::kOfflineModeProperty, PROPERTY_INDEX_OFFLINE_MODE },
   { flimflam::kOperatorCodeProperty, PROPERTY_INDEX_OPERATOR_CODE },
   { flimflam::kOperatorNameProperty, PROPERTY_INDEX_OPERATOR_NAME },
   { flimflam::kPRLVersionProperty, PROPERTY_INDEX_PRL_VERSION },
   { flimflam::kPassphraseProperty, PROPERTY_INDEX_PASSPHRASE },
   { flimflam::kPassphraseRequiredProperty, PROPERTY_INDEX_PASSPHRASE_REQUIRED },
   { flimflam::kPortalURLProperty, PROPERTY_INDEX_PORTAL_URL },
   { flimflam::kPoweredProperty, PROPERTY_INDEX_POWERED },
   { flimflam::kPriorityProperty, PROPERTY_INDEX_PRIORITY },
   { flimflam::kProfileProperty, PROPERTY_INDEX_PROFILE },
   { flimflam::kProfilesProperty, PROPERTY_INDEX_PROFILES },
-  { flimflam::kProviderHostProperty, PROPERTY_INDEX_PROVIDER_HOST },
   { flimflam::kProviderProperty, PROPERTY_INDEX_PROVIDER },
-  { flimflam::kProviderTypeProperty, PROPERTY_INDEX_PROVIDER_TYPE },
   { flimflam::kProxyConfigProperty, PROPERTY_INDEX_PROXY_CONFIG },
   { flimflam::kRoamingStateProperty, PROPERTY_INDEX_ROAMING_STATE },
   { flimflam::kSIMLockStatusProperty, PROPERTY_INDEX_SIM_LOCK },
   { flimflam::kSSIDProperty, PROPERTY_INDEX_SSID },
   { flimflam::kSaveCredentialsProperty, PROPERTY_INDEX_SAVE_CREDENTIALS },
   { flimflam::kScanningProperty, PROPERTY_INDEX_SCANNING },
   { flimflam::kSecurityProperty, PROPERTY_INDEX_SECURITY },
   { flimflam::kSelectedNetworkProperty, PROPERTY_INDEX_SELECTED_NETWORK },
   { flimflam::kServiceWatchListProperty, PROPERTY_INDEX_SERVICE_WATCH_LIST },
   { flimflam::kServicesProperty, PROPERTY_INDEX_SERVICES },
   { flimflam::kServingOperatorProperty, PROPERTY_INDEX_SERVING_OPERATOR },
   { flimflam::kSignalStrengthProperty, PROPERTY_INDEX_SIGNAL_STRENGTH },
   { flimflam::kStateProperty, PROPERTY_INDEX_STATE },
   { flimflam::kSupportNetworkScanProperty,
     PROPERTY_INDEX_SUPPORT_NETWORK_SCAN },
   { flimflam::kTechnologyFamilyProperty, PROPERTY_INDEX_TECHNOLOGY_FAMILY },
   { flimflam::kTypeProperty, PROPERTY_INDEX_TYPE },
   { flimflam::kUIDataProperty, PROPERTY_INDEX_UI_DATA },
   { flimflam::kUsageURLProperty, PROPERTY_INDEX_USAGE_URL },
   { flimflam::kOpenVPNUserProperty, PROPERTY_INDEX_OPEN_VPN_USER },
   { flimflam::kOpenVPNPasswordProperty, PROPERTY_INDEX_OPEN_VPN_PASSWORD },
   { flimflam::kOpenVPNClientCertIdProperty,
     PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_ID },
-  { flimflam::kOpenVPNAuthProperty, PROPERTY_INDEX_OPEN_VPN_AUTH },
-  { flimflam::kOpenVPNAuthRetryProperty, PROPERTY_INDEX_OPEN_VPN_AUTHRETRY },
-  { flimflam::kOpenVPNAuthNoCacheProperty,
-    PROPERTY_INDEX_OPEN_VPN_AUTHNOCACHE },
-  { flimflam::kOpenVPNAuthUserPassProperty,
-    PROPERTY_INDEX_OPEN_VPN_AUTHUSERPASS },
-  { flimflam::kOpenVPNCaCertNSSProperty, PROPERTY_INDEX_OPEN_VPN_CACERT },
-  { flimflam::kOpenVPNClientCertSlotProperty,
-    PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_SLOT },
-  { flimflam::kOpenVPNCipherProperty, PROPERTY_INDEX_OPEN_VPN_CIPHER },
-  { flimflam::kOpenVPNCompLZOProperty, PROPERTY_INDEX_OPEN_VPN_COMPLZO },
-  { flimflam::kOpenVPNCompNoAdaptProperty,
-    PROPERTY_INDEX_OPEN_VPN_COMPNOADAPT },
-  { flimflam::kOpenVPNKeyDirectionProperty,
-    PROPERTY_INDEX_OPEN_VPN_KEYDIRECTION },
-  { flimflam::kOpenVPNMgmtEnableProperty,
-    PROPERTY_INDEX_OPEN_VPN_MGMT_ENABLE },
-  { flimflam::kOpenVPNNsCertTypeProperty, PROPERTY_INDEX_OPEN_VPN_NSCERTTYPE },
-  { flimflam::kOpenVPNOTPProperty, PROPERTY_INDEX_OPEN_VPN_OTP },
-  { flimflam::kOpenVPNPasswordProperty, PROPERTY_INDEX_OPEN_VPN_PASSWORD },
-  { flimflam::kOpenVPNPinProperty, PROPERTY_INDEX_OPEN_VPN_PIN },
-  { flimflam::kOpenVPNPortProperty, PROPERTY_INDEX_OPEN_VPN_PORT },
-  { flimflam::kOpenVPNProtoProperty, PROPERTY_INDEX_OPEN_VPN_PROTO },
-  { flimflam::kOpenVPNProviderProperty,
-    PROPERTY_INDEX_OPEN_VPN_PKCS11_PROVIDER },
-  { flimflam::kOpenVPNPushPeerInfoProperty,
-    PROPERTY_INDEX_OPEN_VPN_PUSHPEERINFO },
-  { flimflam::kOpenVPNRemoteCertEKUProperty,
-    PROPERTY_INDEX_OPEN_VPN_REMOTECERTEKU },
-  { flimflam::kOpenVPNRemoteCertKUProperty,
-    PROPERTY_INDEX_OPEN_VPN_REMOTECERTKU },
-  { flimflam::kOpenVPNRemoteCertTLSProperty,
-    PROPERTY_INDEX_OPEN_VPN_REMOTECERTTLS },
-  { flimflam::kOpenVPNRenegSecProperty, PROPERTY_INDEX_OPEN_VPN_RENEGSEC },
-  { flimflam::kOpenVPNServerPollTimeoutProperty,
-    PROPERTY_INDEX_OPEN_VPN_SERVERPOLLTIMEOUT },
-  { flimflam::kOpenVPNShaperProperty, PROPERTY_INDEX_OPEN_VPN_SHAPER },
-  { flimflam::kOpenVPNStaticChallengeProperty,
-    PROPERTY_INDEX_OPEN_VPN_STATICCHALLENGE },
-  { flimflam::kOpenVPNTLSAuthContentsProperty,
-    PROPERTY_INDEX_OPEN_VPN_TLSAUTHCONTENTS },
-  { flimflam::kOpenVPNTLSRemoteProperty, PROPERTY_INDEX_OPEN_VPN_TLSREMOTE },
-  { flimflam::kOpenVPNUserProperty, PROPERTY_INDEX_OPEN_VPN_USER },
   { flimflam::kPaymentPortalProperty, PROPERTY_INDEX_OLP },
-  { flimflam::kVPNDomainProperty, PROPERTY_INDEX_VPN_DOMAIN },
   { flimflam::kWifiAuthMode, PROPERTY_INDEX_WIFI_AUTH_MODE },
   { flimflam::kWifiFrequency, PROPERTY_INDEX_WIFI_FREQUENCY },
   { flimflam::kWifiHexSsid, PROPERTY_INDEX_WIFI_HEX_SSID },
   { flimflam::kWifiHiddenSsid, PROPERTY_INDEX_WIFI_HIDDEN_SSID },
   { flimflam::kWifiPhyMode, PROPERTY_INDEX_WIFI_PHY_MODE },
 };
 
 EnumMapper<ConnectionType>::Pair network_type_table[] = {
   { flimflam::kTypeEthernet, TYPE_ETHERNET },
   { flimflam::kTypeWifi, TYPE_WIFI },
@@ skipping 22 matching lines @@
 EnumMapper<EAPPhase2Auth>::Pair network_eap_auth_table[] = {
   { flimflam::kEapPhase2AuthPEAPMD5, EAP_PHASE_2_AUTH_MD5 },
   { flimflam::kEapPhase2AuthPEAPMSCHAPV2, EAP_PHASE_2_AUTH_MSCHAPV2 },
   { flimflam::kEapPhase2AuthTTLSMD5, EAP_PHASE_2_AUTH_MD5 },
   { flimflam::kEapPhase2AuthTTLSMSCHAPV2, EAP_PHASE_2_AUTH_MSCHAPV2 },
   { flimflam::kEapPhase2AuthTTLSMSCHAP, EAP_PHASE_2_AUTH_MSCHAP },
   { flimflam::kEapPhase2AuthTTLSPAP, EAP_PHASE_2_AUTH_PAP },
   { flimflam::kEapPhase2AuthTTLSCHAP, EAP_PHASE_2_AUTH_CHAP },
 };
 
-EnumMapper<ProviderType>::Pair provider_type_table[] = {
-  { flimflam::kProviderL2tpIpsec, PROVIDER_TYPE_L2TP_IPSEC_PSK },
-  { flimflam::kProviderOpenVpn, PROVIDER_TYPE_OPEN_VPN },
-};
-
 // Serve the singleton mapper instance.
 const EnumMapper<PropertyIndex>* get_native_mapper() {
   CR_DEFINE_STATIC_LOCAL(EnumMapper<PropertyIndex>, mapper,
       (property_index_table,
        arraysize(property_index_table),
        PROPERTY_INDEX_UNKNOWN));
   return &mapper;
 }
 
 }  // namespace
@@ skipping 994 matching lines @@
       network->set_name(name);
       return true;
     }
     case PROPERTY_INDEX_TYPE: {
       std::string provider_type_string;
       if (!value.GetAsString(&provider_type_string))
         break;
       network->set_provider_type(ParseProviderType(provider_type_string));
       return true;
     }
-    case PROPERTY_INDEX_L2TPIPSEC_CA_CERT_NSS:
-    case PROPERTY_INDEX_OPEN_VPN_CACERT: {
+    case PROPERTY_INDEX_L2TPIPSEC_CA_CERT_NSS: {
       std::string ca_cert_nss;
       if (!value.GetAsString(&ca_cert_nss))
         break;
       network->set_ca_cert_nss(ca_cert_nss);
       return true;
     }
     case PROPERTY_INDEX_L2TPIPSEC_PSK: {
       std::string psk_passphrase;
       if (!value.GetAsString(&psk_passphrase))
         break;
@@ skipping 30 matching lines @@
         break;
       network->set_group_name(group_name);
       return true;
     }
     default:
       break;
   }
   return false;
 }
 
-// static
-const EnumMapper<ProviderType>*
-    NativeVirtualNetworkParser::provider_type_mapper() {
-  CR_DEFINE_STATIC_LOCAL(EnumMapper<ProviderType>, parser,
-      (provider_type_table, arraysize(provider_type_table),
-       PROVIDER_TYPE_MAX));
-  return &parser;
-}
-
 ProviderType NativeVirtualNetworkParser::ParseProviderType(
     const std::string& type) {
-  return provider_type_mapper()->Get(type);
+  static EnumMapper<ProviderType>::Pair table[] = {
+    { flimflam::kProviderL2tpIpsec, PROVIDER_TYPE_L2TP_IPSEC_PSK },
+    { flimflam::kProviderOpenVpn, PROVIDER_TYPE_OPEN_VPN },
+  };
+  CR_DEFINE_STATIC_LOCAL(EnumMapper<ProviderType>, parser,
+      (table, arraysize(table), PROVIDER_TYPE_MAX));
+  return parser.Get(type);
 }
 
 }  // namespace chromeos