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

webkit/tools/test_shell/simple_database_system.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 "webkit/tools/test_shell/simple_database_system.h"
 
 #include "base/auto_reset.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/threading/platform_thread.h"
@@ skipping 157 matching lines @@
 }
 
 void SimpleDatabaseSystem::SetFullFilePathsForVfsFile(
     const string16& origin_identifier,
     const string16& database_name) {
   string16 vfs_file_name = origin_identifier + ASCIIToUTF16("/") +
       database_name + ASCIIToUTF16("#");
   FilePath file_name =
       DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);
 
-  AutoLock file_names_auto_lock(file_names_lock_);
+  base::AutoLock file_names_auto_lock(file_names_lock_);
   file_names_[vfs_file_name] = file_name;
   file_names_[vfs_file_name + ASCIIToUTF16("-journal")] =
       FilePath::FromWStringHack(file_name.ToWStringHack() +
                                 ASCIIToWide("-journal"));
 }
 
 FilePath SimpleDatabaseSystem::GetFullFilePathForVfsFile(
     const string16& vfs_file_name) {
   if (vfs_file_name.empty())  // temp file, used for vacuuming
     return FilePath();
 
-  AutoLock file_names_auto_lock(file_names_lock_);
+  base::AutoLock file_names_auto_lock(file_names_lock_);
   DCHECK(file_names_.find(vfs_file_name) != file_names_.end());
   return file_names_[vfs_file_name];
 }