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

chrome/browser/sync/syncable/syncable.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/sync/syncable/syncable.h"
 
 #include "build/build_config.h"
 
 #include <sys/stat.h>
 #if defined(OS_POSIX)
@@ skipping 560 matching lines @@
   snapshot->kernel_info.next_id -= 65536;
   snapshot->kernel_info_status = kernel_->info_status;
   // This one we reset on failure.
   kernel_->info_status = KERNEL_SHARE_INFO_VALID;
 }
 
 bool Directory::SaveChanges() {
   bool success = false;
   DCHECK(store_);
 
-  AutoLock scoped_lock(kernel_->save_changes_mutex);
+  base::AutoLock scoped_lock(kernel_->save_changes_mutex);
 
   // Snapshot and save.
   SaveChangesSnapshot snapshot;
   TakeSnapshotForSaveChanges(&snapshot);
   success = store_->SaveChanges(snapshot);
 
   // Handle success or failure.
   if (success)
     VacuumAfterSaveChanges(snapshot);
   else
@@ skipping 530 matching lines @@
 
   if (NULL == originals.get() || originals->empty()) {
     dirkernel_->transaction_mutex.Release();
     return false;
   }
 
 
   {
     // Scoped_lock is only active through the calculate_changes and
     // transaction_ending events.
-    AutoLock scoped_lock(dirkernel_->changes_channel_mutex);
+    base::AutoLock scoped_lock(dirkernel_->changes_channel_mutex);
 
     // Tell listeners to calculate changes while we still have the mutex.
     DirectoryChangeEvent event = { DirectoryChangeEvent::CALCULATE_CHANGES,
                                    originals.get(), this, writer_ };
     dirkernel_->changes_channel.Notify(event);
 
     // Necessary for reads to be performed prior to transaction mutex release.
     // Allows the listener to use the current transaction to perform reads.
     DirectoryChangeEvent ending_event =
         { DirectoryChangeEvent::TRANSACTION_ENDING,
@@ skipping 587 matching lines @@
 
 FastDump& operator<<(FastDump& dump, const Blob& blob) {
   if (blob.empty())
     return dump;
   string buffer(base::HexEncode(&blob[0], blob.size()));
   dump.out_->sputn(buffer.c_str(), buffer.size());
   return dump;
 }
 
 }  // namespace syncable