Remove references to CWNetwork.

components/wifi/wifi_service_mac.mm

 // Copyright 2014 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"
 
 #import <CoreWLAN/CoreWLAN.h>
 #import <netinet/in.h>
 #import <SystemConfiguration/SystemConfiguration.h>
 
@@ skipping 83 matching lines @@
 
   // Gets unique |network_guid| string based on |ssid|.
   std::string GUIDFromSSID(NSString* ssid) const {
     return base::SysNSStringToUTF8(ssid);
   }
 
   // Populates |properties| from |network|.
   void NetworkPropertiesFromCWNetwork(const CWNetwork* network,
                                       NetworkProperties* properties) const;
 
-  // Converts |CWSecurityMode| into onc::wifi::k{WPA|WEP}* security constant.
-  std::string SecurityFromCWSecurityMode(CWSecurityMode security) const;
-
   // Returns onc::wifi::k{WPA|WEP}* security constant supported by the
   // |CWNetwork|.
   std::string SecurityFromCWNetwork(const CWNetwork* network) const;
 
   // Converts |CWChannelBand| into Frequency constant.
   Frequency FrequencyFromCWChannelBand(CWChannelBand band) const;
 
   // Gets current |onc::connection_state| for given |network_guid|.
   std::string GetNetworkConnectionState(const std::string& network_guid) const;
 
@@ skipping 397 matching lines @@
   properties->ssid = base::SysNSStringToUTF8([network ssid]);
   properties->name = properties->ssid;
   properties->guid = network_guid;
   properties->type = onc::network_type::kWiFi;
 
   properties->bssid = base::SysNSStringToUTF8([network bssid]);
   properties->frequency = FrequencyFromCWChannelBand(
       static_cast<CWChannelBand>([[network wlanChannel] channelBand]));
   properties->frequency_set.insert(properties->frequency);
 
-  // -[CWNetwork supportsSecurity:] is available from 10.7 SDK while
-  // -[CWNetwork securityMode] is deprecated and hidden as private since
-  // 10.9 SDK. The latter is kept for now to support running on 10.6. It
-  // should be removed when 10.6 support is dropped.
-  if ([network respondsToSelector:@selector(supportsSecurity:)]) {
-    properties->security = SecurityFromCWNetwork(network);
-  } else {
-    properties->security = SecurityFromCWSecurityMode(
-        static_cast<CWSecurityMode>([[network securityMode] intValue]));
-  }
-
-  // rssiValue property of CWNetwork is available from 10.7 SDK while
-  // -[CWNetwork rssi] is deprecated and hidden as private since 10.9 SDK.
-  // The latter is kept for now to support running on 10.6. It should be
-  // removed when 10.6 support is dropped.
-  if ([network respondsToSelector:@selector(rssiValue)])
-    properties->signal_strength = [network rssiValue];
-  else
-    properties->signal_strength = [[network rssi] intValue];
-}
-
-std::string WiFiServiceMac::SecurityFromCWSecurityMode(
-    CWSecurityMode security) const {
-  switch (security) {
-    case kCWSecurityModeWPA_Enterprise:
-    case kCWSecurityModeWPA2_Enterprise:
-      return onc::wifi::kWPA_EAP;
-    case kCWSecurityModeWPA_PSK:
-    case kCWSecurityModeWPA2_PSK:
-      return onc::wifi::kWPA_PSK;
-    case kCWSecurityModeWEP:
-      return onc::wifi::kWEP_PSK;
-    case kCWSecurityModeOpen:
-      return onc::wifi::kSecurityNone;
-    // TODO(mef): Figure out correct mapping.
-    case kCWSecurityModeWPS:
-    case kCWSecurityModeDynamicWEP:
-      return onc::wifi::kWPA_EAP;
-  }
-  return onc::wifi::kWPA_EAP;
+  properties->security = SecurityFromCWNetwork(network);
+  properties->signal_strength = [network rssiValue];
 }
 
 std::string WiFiServiceMac::SecurityFromCWNetwork(
     const CWNetwork* network) const {
   if ([network supportsSecurity:kCWSecurityWPAEnterprise] ||
       [network supportsSecurity:kCWSecurityWPA2Enterprise]) {
     return onc::wifi::kWPA_EAP;
   }
 
   if ([network supportsSecurity:kCWSecurityWPAPersonal] ||
@@ skipping 80 matching lines @@
   DVLOG(1) << "NotifyNetworkChanged: " << network_guid;
   NetworkGuidList changed_networks(1, network_guid);
   event_task_runner_->PostTask(
       FROM_HERE, base::Bind(networks_changed_observer_, changed_networks));
 }
 
 // static
 WiFiService* WiFiService::Create() { return new WiFiServiceMac(); }
 
 }  // namespace wifi