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

chrome/browser/geolocation/gateway_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/gateway_data_provider_common.h"
 
 #include "base/utf_string_conversions.h"
 
 GatewayDataProviderCommon::GatewayDataProviderCommon()
     : Thread("Geolocation_gateway_provider"),
@@ skipping 14 matching lines @@
 }
 
 void GatewayDataProviderCommon::StopDataProvider() {
   DCHECK(CalledOnClientThread());
   Stop();
 }
 
 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.
   return is_first_scan_complete_;
 }
 
 // Thread implementation.
 void GatewayDataProviderCommon::Init() {
   DCHECK(gateway_api_ == NULL);
   gateway_api_.reset(NewGatewayApi());
@@ skipping 14 matching lines @@
   polling_policy_.reset();
 }
 
 void GatewayDataProviderCommon::DoRouterScanTask() {
   bool update_available = false;
   GatewayData new_data;
   if (!gateway_api_->GetRouterData(&new_data.router_data)) {
     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;
     }
     ScheduleNextScan(polling_policy_->PollingInterval());
   }
   if (update_available || !is_first_scan_complete_) {
     is_first_scan_complete_ = true;
     NotifyListeners();
   }
 }
 
 void GatewayDataProviderCommon::ScheduleNextScan(int interval) {
   message_loop()->PostDelayedTask(
       FROM_HERE, task_factory_.NewRunnableMethod(
           &GatewayDataProviderCommon::DoRouterScanTask), interval);
 }
 
 GatewayPollingPolicyInterface* GatewayDataProviderCommon::NewPollingPolicy() {
   return new GenericGatewayPollingPolicy;
 }