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

chrome/browser/geolocation/wifi_data_provider_mac.cc

 // Copyright (c) 2010 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.
 
 // We use the OSX system API function WirelessScanSplit. This function is not
 // documented or included in the SDK, so we use a reverse-engineered header,
 // osx_wifi_.h. This file is taken from the iStumbler project
 // (http://www.istumbler.net).
 
 // TODO(joth): port to chromium
@@ skipping 21 matching lines @@
 OsxWifiDataProvider::OsxWifiDataProvider() : is_first_scan_complete_(false) {
   Start();
 }
 
 OsxWifiDataProvider::~OsxWifiDataProvider() {
   stop_event_.Signal();
   Join();
 }
 
 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
   // data we can get.
   return is_first_scan_complete_;
 }
 
 // Thread implementation
 void OsxWifiDataProvider::Run() {
   void *apple_80211_library = dlopen(
       "/System/Library/PrivateFrameworks/Apple80211.framework/Apple80211",
       RTLD_LAZY);
   if (!apple_80211_library) {
     is_first_scan_complete_ = true;
     return;
   }
 
   WirelessAttach_function_ = reinterpret_cast<WirelessAttachFunction>(
       dlsym(apple_80211_library, "WirelessAttach"));
   WirelessScanSplit_function_ = reinterpret_cast<WirelessScanSplitFunction>(
       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_);
 
   if ((*WirelessAttach_function_)(&wifi_context_, 0) != noErr) {
     is_first_scan_complete_ = true;
     return;
   }
 
   // Regularly get the access point data.
   int polling_interval = kDefaultPollingInterval;
@@ skipping 13 matching lines @@
     }
   } while (!stop_event_.WaitWithTimeout(polling_interval));
 
   (*WirelessDetach_function_)(wifi_context_);
 
   dlclose(apple_80211_library);
 }
 
 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_,
                                      &managed_access_points,
                                      &adhoc_access_points,
                                      0) != noErr) {
     return;
   }
 
   if (managed_access_points == NULL) {
@@ skipping 25 matching lines @@
                        access_point_info->nameLen,
                        &ssid)) {
       access_point_data.ssid = ssid;
     }
 
     access_points->insert(access_point_data);
   }
 }
 
 #endif  // 0