diff options
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/simple_database_system.cc | 4 | ||||
-rw-r--r-- | webkit/tools/test_shell/simple_database_system.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/simple_database_system.cc b/webkit/tools/test_shell/simple_database_system.cc index d407359..dc80f69 100644 --- a/webkit/tools/test_shell/simple_database_system.cc +++ b/webkit/tools/test_shell/simple_database_system.cc @@ -175,7 +175,7 @@ void SimpleDatabaseSystem::SetFullFilePathsForVfsFile( 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() + @@ -187,7 +187,7 @@ FilePath SimpleDatabaseSystem::GetFullFilePathForVfsFile( 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]; } diff --git a/webkit/tools/test_shell/simple_database_system.h b/webkit/tools/test_shell/simple_database_system.h index 74214e8..7efe072 100644 --- a/webkit/tools/test_shell/simple_database_system.h +++ b/webkit/tools/test_shell/simple_database_system.h @@ -7,11 +7,11 @@ #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/Source/WebKit/chromium/public/WebDatabaseObserver.h" #include "webkit/database/database_connections.h" #include "webkit/database/database_tracker.h" @@ -75,7 +75,7 @@ class SimpleDatabaseSystem : public webkit_database::DatabaseTracker::Observer, 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_; |