diff options
| -rw-r--r-- | chromium/services/device/geolocation/wifi_data_provider_mac.mm | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/chromium/services/device/geolocation/wifi_data_provider_mac.mm b/chromium/services/device/geolocation/wifi_data_provider_mac.mm index 278a5385708..1b53ce41c42 100644 --- a/chromium/services/device/geolocation/wifi_data_provider_mac.mm +++ b/chromium/services/device/geolocation/wifi_data_provider_mac.mm @@ -22,10 +22,8 @@ #include "services/device/geolocation/wifi_data_provider_common.h" #include "services/device/geolocation/wifi_data_provider_manager.h" -extern "C" NSString* const kCWScanKeyMerge; - @interface CWInterface (Private) -- (NSArray*)scanForNetworksWithParameters:(NSDictionary*)params +- (NSSet<CWNetwork *> *)scanForNetworksWithName:(NSString *)networkName error:(NSError**)error; @end @@ -46,9 +44,6 @@ class CoreWlanApi : public WifiDataProviderCommon::WlanApiInterface { bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) { base::mac::ScopedNSAutoreleasePool auto_pool; - // Initialize the scan parameters with scan key merging disabled, so we get - // every AP listed in the scan without any SSID de-duping logic. - NSDictionary* params = @{ kCWScanKeyMerge : @NO }; NSSet* supported_interfaces = [CWInterface interfaceNames]; NSUInteger interface_error_count = 0; @@ -64,8 +59,8 @@ bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) { const base::TimeTicks start_time = base::TimeTicks::Now(); NSError* err = nil; - NSArray* scan = - [corewlan_interface scanForNetworksWithParameters:params error:&err]; + NSSet<CWNetwork *>* scan = + [corewlan_interface scanForNetworksWithName:nil error:&err]; const int error_code = [err code]; const int count = [scan count]; // We could get an error code but count != 0 if the scan was interrupted, |