ONC: Cleanup client certificate related fields.

components/wifi/wifi_service_win.cc

 // Copyright 2013 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 "components/wifi/wifi_service.h"
 
 #include <iphlpapi.h>
 #include <objbase.h>
 #include <wlanapi.h>
 
@@ skipping 1238 matching lines @@
 std::string WiFiServiceImpl::SecurityFromDot11AuthAlg(
     DOT11_AUTH_ALGORITHM alg) const {
   switch (alg) {
     case DOT11_AUTH_ALGO_RSNA:
       return onc::wifi::kWPA_EAP;
     case DOT11_AUTH_ALGO_RSNA_PSK:
       return onc::wifi::kWPA_PSK;
     case DOT11_AUTH_ALGO_80211_SHARED_KEY:
       return onc::wifi::kWEP_PSK;
     case DOT11_AUTH_ALGO_80211_OPEN:
-      return onc::wifi::kNone;
+      return onc::wifi::kSecurityNone;
     default:
       return onc::wifi::kWPA_EAP;
   }
 }
 
 std::string WiFiServiceImpl::ConnectionStateFromInterfaceState(
     WLAN_INTERFACE_STATE wlan_state) const {
   switch (wlan_state) {
     case wlan_interface_state_connected:
       // TODO(mef): Even if |wlan_state| is connected, the network may still
@@ skipping 323 matching lines @@
       // If network is available, but is not open security, then it cannot be
       // connected without profile, so return 'access denied' error.
       scoped_ptr<base::DictionaryValue> properties (new base::DictionaryValue);
       const base::DictionaryValue* wifi;
       std::string wifi_security;
       std::string error_string;
       GetProperties(network_guid, properties.get(), &error_string);
       if (error_string.empty() &&
           properties->GetDictionary(onc::network_type::kWiFi, &wifi) &&
           wifi->GetString(onc::wifi::kSecurity, &wifi_security) &&
-          wifi_security != onc::wifi::kNone) {
+          wifi_security != onc::wifi::kSecurityNone) {
         error = ERROR_ACCESS_DENIED;
         LOG(ERROR) << error;
         return error;
       }
       WLAN_CONNECTION_PARAMETERS wlan_params = {
           wlan_connection_mode_discovery_unsecure,
           NULL,
           &ssid,
           desired_bss_list.get(),
           dot11_BSS_type_infrastructure,
@@ skipping 122 matching lines @@
     return kEncryptionTKIP;
   return kEncryptionAES;
 }
 
 bool WiFiServiceImpl::AuthEncryptionFromSecurity(
     const std::string& security,
     EncryptionType encryption_type,
     std::string* authentication,
     std::string* encryption,
     std::string* key_type) const {
-  if (security == onc::wifi::kNone) {
+  if (security == onc::wifi::kSecurityNone) {
     *authentication = kAuthenticationOpen;
     *encryption = kEncryptionNone;
   } else if (security == onc::wifi::kWEP_PSK) {
     *authentication = kAuthenticationOpen;
     *encryption = kEncryptionWEP;
     *key_type = kKeyTypeNetwork;
   } else if (security == onc::wifi::kWPA_PSK) {
     *authentication = kAuthenticationWpaPsk;
     *encryption = WpaEncryptionFromEncryptionType(encryption_type);
     *key_type = kKeyTypePassphrase;
@@ skipping 83 matching lines @@
     NetworkGuidList changed_networks(1, network_guid);
     message_loop_proxy_->PostTask(
         FROM_HERE,
         base::Bind(networks_changed_observer_, changed_networks));
   }
 }
 
 WiFiService* WiFiService::Create() { return new WiFiServiceImpl(); }
 
 }  // namespace wifi