Fix use of deprecated method for scanning wifi networks

scanForNetworksWithParameters has ben removed in the sdk that ships
with XCode 11. Replace its use with scanForNetworksWithName.

The results should be the same.

Change-Id: Ifaeb6b380d02364133280b44644ae8ca1e51119a
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

1 files changed, 4 insertions, 10 deletions

diff --git a/chromium/services/device/geolocation/wifi_data_provider_mac.mm b/chromium/services/device/geolocation/wifi_data_provider_mac.mm
index 83cae228c2b..072db591635 100644
--- a/chromium/services/device/geolocation/wifi_data_provider_mac.mm
+++ b/chromium/services/device/geolocation/wifi_data_provider_mac.mm
@@ -21,10 +21,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
 
@@ -44,11 +42,7 @@ class CoreWlanApi : public WifiDataProviderCommon::WlanApiInterface {
 };
 
 bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) {
-  @autoreleasepool {  // 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};
-
+  @autoreleasepool {
     NSSet* supported_interfaces = [CWInterface interfaceNames];
     NSUInteger interface_error_count = 0;
     for (NSString* interface_name in supported_interfaces) {
@@ -63,8 +57,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,