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

chrome/browser/safe_browsing/safe_browsing_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/safe_browsing/safe_browsing_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
@@ skipping 559 matching lines @@
     if ((*it)->client)
       (*it)->client->OnSafeBrowsingResult((*it)->url, URL_SAFE);
     delete *it;
   }
   checks_.clear();
 
   gethash_requests_.clear();
 }
 
 bool SafeBrowsingService::DatabaseAvailable() const {
-  AutoLock lock(database_lock_);
+  base::AutoLock lock(database_lock_);
   return !closing_database_ && (database_ != NULL);
 }
 
 bool SafeBrowsingService::MakeDatabaseAvailable() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(enabled_);
   if (DatabaseAvailable())
     return true;
   safe_browsing_thread_->message_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(this, &SafeBrowsingService::GetDatabase));
@@ skipping 12 matching lines @@
 
   Time before = Time::Now();
 
   SafeBrowsingDatabase* database =
       SafeBrowsingDatabase::Create(enable_download_protection_);
 
   database->Init(path);
   {
     // Acquiring the lock here guarantees correct ordering between the writes to
     // the new database object above, and the setting of |databse_| below.
-    AutoLock lock(database_lock_);
+    base::AutoLock lock(database_lock_);
     database_ = database;
   }
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &SafeBrowsingService::DatabaseLoadComplete));
 
   UMA_HISTOGRAM_TIMES("SB2.DatabaseOpen", Time::Now() - before);
   return database_;
 }
@@ skipping 183 matching lines @@
 
   // Because |closing_database_| is true, nothing on the IO thread will be
   // accessing the database, so it's safe to delete and then NULL the pointer.
   delete database_;
   database_ = NULL;
 
   // Acquiring the lock here guarantees correct ordering between the resetting
   // of |database_| above and of |closing_database_| below, which ensures there
   // won't be a window during which the IO thread falsely believes the database
   // is available.
-  AutoLock lock(database_lock_);
+  base::AutoLock lock(database_lock_);
   closing_database_ = false;
 }
 
 void SafeBrowsingService::OnResetDatabase() {
   DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
   GetDatabase()->ResetDatabase();
 }
 
 void SafeBrowsingService::CacheHashResults(
   const std::vector<SBPrefix>& prefixes,
@@ skipping 137 matching lines @@
 // checkbox on the blocking page.
 void SafeBrowsingService::ReportMalwareDetails(
     scoped_refptr<MalwareDetails> details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   scoped_ptr<const std::string> serialized(details->GetSerializedReport());
   if (!serialized->empty()) {
     DVLOG(1) << "Sending serialized malware details.";
     protocol_manager_->ReportMalwareDetails(*serialized);
   }
 }