Revert 37989 - unit test failed on Mac builder despite passing on try server...

chrome/browser/geolocation/wifi_data_provider_mac.cc

Index: chrome/browser/geolocation/wifi_data_provider_mac.cc
===================================================================
--- chrome/browser/geolocation/wifi_data_provider_mac.cc	(revision 37991)
+++ chrome/browser/geolocation/wifi_data_provider_mac.cc	(working copy)
@@ -39,7 +39,7 @@
 }
 
 bool OsxWifiDataProvider::GetData(WifiData *data) {
-  DCHECK(data);
+  assert(data);
   MutexLock lock(&data_mutex_);
   *data = wifi_data_;
   // If we've successfully completed a scan, indicate that we have all of the
@@ -63,7 +63,7 @@
       dlsym(apple_80211_library, "WirelessScanSplit"));
   WirelessDetach_function_ = reinterpret_cast<WirelessDetachFunction>(
       dlsym(apple_80211_library, "WirelessDetach"));
-  DCHECK(WirelessAttach_function_ &&
+  assert(WirelessAttach_function_ &&
          WirelessScanSplit_function_ &&
          WirelessDetach_function_);
 
@@ -97,8 +97,8 @@
 
 void OsxWifiDataProvider::GetAccessPointData(
     WifiData::AccessPointDataSet *access_points) {
-  DCHECK(access_points);
-  DCHECK(WirelessScanSplit_function_);
+  assert(access_points);
+  assert(WirelessScanSplit_function_);
   CFArrayRef managed_access_points = NULL;
   CFArrayRef adhoc_access_points = NULL;
   if ((*WirelessScanSplit_function_)(wifi_context_,