chromeos networking: move from security to securityclass property

chromeos/network/onc/onc_translation_tables.cc

 // Copyright (c) 2012 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 "chromeos/network/onc/onc_translation_tables.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "components/onc/onc_constants.h"
@@ skipping 102 matching lines @@
     { ::onc::wifi::kBSSID, shill::kWifiBSsid},
     // This dictionary is converted during translation, see onc_translator_*.
     // { ::onc::wifi::kEAP, shill::kEap*},
     { ::onc::wifi::kFrequency, shill::kWifiFrequency},
     { ::onc::wifi::kFrequencyList, shill::kWifiFrequencyListProperty},
     { ::onc::wifi::kHiddenSSID, shill::kWifiHiddenSsid},
     { ::onc::wifi::kPassphrase, shill::kPassphraseProperty},
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::wifi::kSSID, shill::kWifiHexSsid},
     // This field is converted during translation, see onc_translator_*.
-    // { ::onc::wifi::kSecurity, shill::kSecurityProperty },
+    // { ::onc::wifi::kSecurity, shill::kSecurityClassProperty },
     { ::onc::wifi::kSignalStrength, shill::kSignalStrengthProperty},
     {NULL}};
 
 const FieldTranslationEntry wimax_fields[] = {
     { ::onc::wimax::kAutoConnect, shill::kAutoConnectProperty},
     // This dictionary is converted during translation, see onc_translator_*.
     // { ::onc::wimax::kEAP, shill::kEap*},
     { ::onc::wimax::kSignalStrength, shill::kSignalStrengthProperty},
     {NULL}};
 
@@ skipping 144 matching lines @@
     { ::onc::network_type::kCellular, shill::kTypeCellular},
     { ::onc::network_type::kVPN, shill::kTypeVPN},
     {NULL}};
 
 const StringTranslationEntry kVPNTypeTable[] = {
     { ::onc::vpn::kTypeL2TP_IPsec, shill::kProviderL2tpIpsec},
     { ::onc::vpn::kOpenVPN, shill::kProviderOpenVpn},
     { ::onc::vpn::kThirdPartyVpn, shill::kProviderThirdPartyVpn},
     {NULL}};
 
-// The first matching line is chosen.
 const StringTranslationEntry kWiFiSecurityTable[] = {
     { ::onc::wifi::kSecurityNone, shill::kSecurityNone},
     { ::onc::wifi::kWEP_PSK, shill::kSecurityWep},
     { ::onc::wifi::kWPA_PSK, shill::kSecurityPsk},
     { ::onc::wifi::kWPA_EAP, shill::kSecurity8021x},
-    { ::onc::wifi::kWPA_PSK, shill::kSecurityRsn},
-    { ::onc::wifi::kWPA_PSK, shill::kSecurityWpa},
     {NULL}};
 
 const StringTranslationEntry kEAPOuterTable[] = {
     { ::onc::eap::kPEAP, shill::kEapMethodPEAP},
     { ::onc::eap::kEAP_TLS, shill::kEapMethodTLS},
     { ::onc::eap::kEAP_TTLS, shill::kEapMethodTTLS},
     { ::onc::eap::kLEAP, shill::kEapMethodLEAP},
     {NULL}};
 
 // Translation of the EAP.Inner field in case of EAP.Outer == PEAP
@@ skipping 113 matching lines @@
       continue;
     *onc_value = table[i].onc_value;
     return true;
   }
   LOG(ERROR) << "Value '" << shill_value << "' cannot be translated to ONC";
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos