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

chrome/browser/webdata/web_data_service.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/webdata/web_data_service.h"
 
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
@@ skipping 55 matching lines @@
 
 bool WebDataService::IsRunning() const {
   return is_running_;
 }
 
 void WebDataService::UnloadDatabase() {
   ScheduleTask(NewRunnableMethod(this, &WebDataService::ShutdownDatabase));
 }
 
 void WebDataService::CancelRequest(Handle h) {
-  AutoLock l(pending_lock_);
+  base::AutoLock l(pending_lock_);
   RequestMap::iterator i = pending_requests_.find(h);
   if (i == pending_requests_.end()) {
     NOTREACHED() << "Canceling a nonexistent web data service request";
     return;
   }
   i->second->Cancel();
 }
 
 bool WebDataService::IsDatabaseLoaded() {
   return db_ != NULL;
@@ skipping 453 matching lines @@
             static_cast<const WDResult<std::vector<CreditCard*> >*>(result);
 
         std::vector<CreditCard*> credit_cards = r->GetValue();
         STLDeleteElements(&credit_cards);
       }
     }
   }
 }
 
 void WebDataService::RegisterRequest(WebDataRequest* request) {
-  AutoLock l(pending_lock_);
+  base::AutoLock l(pending_lock_);
   pending_requests_[request->GetHandle()] = request;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The following methods are executed in Chrome_WebDataThread.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::DBInitFailed(sql::InitStatus init_status) {
@@ skipping 69 matching lines @@
 }
 
 void WebDataService::ScheduleCommit() {
   if (should_commit_ == false) {
     should_commit_ = true;
     ScheduleTask(NewRunnableMethod(this, &WebDataService::Commit));
   }
 }
 
 int WebDataService::GetNextRequestHandle() {
-  AutoLock l(pending_lock_);
+  base::AutoLock l(pending_lock_);
   return ++next_request_handle_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Keywords implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::AddKeywordImpl(GenericRequest<TemplateURL>* request) {
@@ skipping 624 matching lines @@
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   WebDataService* s = service_;
   Task* t = NewRunnableMethod(s,
                               &WebDataService::RequestCompleted,
                               handle_);
   message_loop_->PostTask(FROM_HERE, t);
 }