Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

chrome/browser/geolocation/wifi_data_provider_common.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.
 
 #include "chrome/browser/geolocation/wifi_data_provider_common.h"
 
 #include "base/utf_string_conversions.h"
 
 string16 MacAddressAsString16(const uint8 mac_as_int[6]) {
   // mac_as_int is big-endian. Write in byte chunks.
@@ skipping 24 matching lines @@
 }
 
 void WifiDataProviderCommon::StopDataProvider() {
   DCHECK(CalledOnClientThread());
   Stop();
 }
 
 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.
   return is_first_scan_complete_;
 }
 
 // Thread implementation
 void WifiDataProviderCommon::Init() {
   DCHECK(wlan_api_ == NULL);
   wlan_api_.reset(NewWlanApi());
@@ skipping 18 matching lines @@
   polling_policy_.reset();
 }
 
 void WifiDataProviderCommon::DoWifiScanTask() {
   bool update_available = false;
   WifiData new_data;
   if (!wlan_api_->GetAccessPointData(&new_data.access_point_data)) {
     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;
     }
     polling_policy_->UpdatePollingInterval(update_available);
     ScheduleNextScan(polling_policy_->PollingInterval());
   }
   if (update_available || !is_first_scan_complete_) {
     is_first_scan_complete_ = true;
     NotifyListeners();
   }
 }
 
 void WifiDataProviderCommon::ScheduleNextScan(int interval) {
   message_loop()->PostDelayedTask(
       FROM_HERE,
       task_factory_.NewRunnableMethod(&WifiDataProviderCommon::DoWifiScanTask),
       interval);
 }