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

webkit/tools/test_shell/simple_database_system.h

 // 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.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_DATABASE_SYSTEM_H_
 #define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_DATABASE_SYSTEM_H_
 
 #include "base/file_path.h"
 #include "base/hash_tables.h"
-#include "base/lock.h"
 #include "base/platform_file.h"
 #include "base/ref_counted.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string16.h"
+#include "base/synchronization/lock.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDatabaseObserver.h"
 #include "webkit/database/database_connections.h"
 #include "webkit/database/database_tracker.h"
 
 class SimpleDatabaseSystem : public webkit_database::DatabaseTracker::Observer,
                              public WebKit::WebDatabaseObserver {
  public:
   static SimpleDatabaseSystem* GetInstance();
   SimpleDatabaseSystem();
   ~SimpleDatabaseSystem();
@@ skipping 43 matching lines @@
   FilePath GetFullFilePathForVfsFile(const string16& vfs_file_name);
 
   static SimpleDatabaseSystem* instance_;
 
   bool waiting_for_dbs_to_close_;
 
   ScopedTempDir temp_dir_;
 
   scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
 
-  Lock file_names_lock_;
+  base::Lock file_names_lock_;
   base::hash_map<string16, FilePath> file_names_;
 
   webkit_database::DatabaseConnections database_connections_;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_DATABASE_SYSTEM_H_