diff options
Diffstat (limited to 'chrome/browser/geolocation')
4 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/geolocation/gateway_data_provider_common.cc b/chrome/browser/geolocation/gateway_data_provider_common.cc index 363967c..2289371 100644 --- a/chrome/browser/geolocation/gateway_data_provider_common.cc +++ b/chrome/browser/geolocation/gateway_data_provider_common.cc @@ -32,7 +32,7 @@ void GatewayDataProviderCommon::StopDataProvider() { bool GatewayDataProviderCommon::GetData(GatewayData *data) { DCHECK(CalledOnClientThread()); DCHECK(data); - AutoLock lock(data_mutex_); + base::AutoLock lock(data_mutex_); *data = gateway_data_; // If we've successfully completed a scan, indicate that we have all of the // data we can get. @@ -67,7 +67,7 @@ void GatewayDataProviderCommon::DoRouterScanTask() { ScheduleNextScan(polling_policy_->NoRouterInterval()); } else { { - AutoLock lock(data_mutex_); + base::AutoLock lock(data_mutex_); update_available = gateway_data_.DiffersSignificantly(new_data); gateway_data_ = new_data; } diff --git a/chrome/browser/geolocation/gateway_data_provider_common.h b/chrome/browser/geolocation/gateway_data_provider_common.h index cc1c85a..ba0eb58 100644 --- a/chrome/browser/geolocation/gateway_data_provider_common.h +++ b/chrome/browser/geolocation/gateway_data_provider_common.h @@ -83,7 +83,7 @@ class GatewayDataProviderCommon // Will schedule a scan; i.e. enqueue DoRouterScanTask deferred task. void ScheduleNextScan(int interval); - Lock data_mutex_; + base::Lock data_mutex_; // Whether we've successfully completed a scan for gateway data (or the // polling thread has terminated early). bool is_first_scan_complete_; diff --git a/chrome/browser/geolocation/wifi_data_provider_common.cc b/chrome/browser/geolocation/wifi_data_provider_common.cc index bfa1c5e..3874cfd 100644 --- a/chrome/browser/geolocation/wifi_data_provider_common.cc +++ b/chrome/browser/geolocation/wifi_data_provider_common.cc @@ -42,7 +42,7 @@ void WifiDataProviderCommon::StopDataProvider() { bool WifiDataProviderCommon::GetData(WifiData *data) { DCHECK(CalledOnClientThread()); DCHECK(data); - AutoLock lock(data_mutex_); + base::AutoLock lock(data_mutex_); *data = wifi_data_; // If we've successfully completed a scan, indicate that we have all of the // data we can get. @@ -81,7 +81,7 @@ void WifiDataProviderCommon::DoWifiScanTask() { ScheduleNextScan(polling_policy_->NoWifiInterval()); } else { { - AutoLock lock(data_mutex_); + base::AutoLock lock(data_mutex_); update_available = wifi_data_.DiffersSignificantly(new_data); wifi_data_ = new_data; } diff --git a/chrome/browser/geolocation/wifi_data_provider_common.h b/chrome/browser/geolocation/wifi_data_provider_common.h index c647c06..70477c1 100644 --- a/chrome/browser/geolocation/wifi_data_provider_common.h +++ b/chrome/browser/geolocation/wifi_data_provider_common.h @@ -105,7 +105,7 @@ class WifiDataProviderCommon void ScheduleNextScan(int interval); WifiData wifi_data_; - Lock data_mutex_; + base::Lock data_mutex_; // Whether we've successfully completed a scan for WiFi data (or the polling // thread has terminated early). |